From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Date: Fri, 18 May 2012 11:32:36 +0000 (+0300)
Subject: UBIFS: make ubifs_lpt_init clean-up in case of failure
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=499429760650018216eb8d0b35067cf2c5c4520b;p=openwrt%2Fstaging%2Fblogic.git

UBIFS: make ubifs_lpt_init clean-up in case of failure

Most functions in UBIFS follow the following designn pattern: if the function
allocates multiple resources, and failss at some point, it frees what it has
allocated and returns an error. So the caller can rely on the fact that the
callee has cleaned up everything after own failure.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Acked-by: Sidney Amani <seed95@gmail.com>
---

diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
index 2054e8171fd4..b4280c44949c 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -1740,16 +1740,20 @@ int ubifs_lpt_init(struct ubifs_info *c, int rd, int wr)
 	if (rd) {
 		err = lpt_init_rd(c);
 		if (err)
-			return err;
+			goto out_err;
 	}
 
 	if (wr) {
 		err = lpt_init_wr(c);
 		if (err)
-			return err;
+			goto out_err;
 	}
 
 	return 0;
+
+out_err:
+	ubifs_lpt_free(c, 0);
+	return err;
 }
 
 /**