From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 22 Apr 2008 10:25:47 +0000 (+0100)
Subject: [JFFS2] Fix sparse warning in nodemgmt.c
X-Git-Tag: v2.6.26-rc1~1069^2~67
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8ca646abb4503f39a7d235b89b9f8015e3ab4631;p=linux-2.6-omap-h63xx.git

[JFFS2] Fix sparse warning in nodemgmt.c

fs/jffs2/nodemgmt.c:60:8: warning: symbol 'ret' shadows an earlier one
fs/jffs2/nodemgmt.c:45:6: originally declared here

(reported by Harvey Harrison)

Just remove the offending declaration of 'int ret' and use the earlier one.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index a0313fa8748..a3e67a4ed67 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -57,7 +57,6 @@ int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,
 	/* this needs a little more thought (true <tglx> :)) */
 	while(ret == -EAGAIN) {
 		while(c->nr_free_blocks + c->nr_erasing_blocks < blocksneeded) {
-			int ret;
 			uint32_t dirty, avail;
 
 			/* calculate real dirty size