| From 764f8c98275fd736f533b0ced005af9ffafdf423 Mon Sep 17 00:00:00 2001 |
| From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> |
| Date: Fri, 25 Mar 2011 18:33:57 +0200 |
| Subject: [PATCH] UBIFS: do not read flash unnecessarily |
| |
| commit 8b229c76765816796eec7ccd428f03bd8de8b525 upstream. |
| |
| This fix makes the 'dbg_check_old_index()' function return |
| immediately if debugging is disabled, instead of executing |
| incorrect 'goto out' which causes UBIFS to: |
| |
| 1. Allocate memory |
| 2. Read the flash |
| |
| On every commit. OK, we do not commit that often, but it is |
| still silly to do unneeded I/O anyway. |
| |
| Credits to coverity for spotting this silly issue. |
| |
| Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c |
| index 37fa7ed..de01f28 100644 |
| --- a/fs/ubifs/commit.c |
| +++ b/fs/ubifs/commit.c |
| @@ -519,7 +519,7 @@ int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot) |
| size_t sz; |
| |
| if (!(ubifs_chk_flags & UBIFS_CHK_OLD_IDX)) |
| - goto out; |
| + return 0; |
| |
| INIT_LIST_HEAD(&list); |
| |
| -- |
| 1.7.4.4 |
| |
