public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Harvey Harrison <harvey.harrison@gmail.com>
To: David Woodhouse <dwmw2@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/4] jffs2: fix sparse warnings in gc.c
Date: Fri, 15 Feb 2008 19:22:16 -0800	[thread overview]
Message-ID: <1203132137.7442.35.camel@brick> (raw)

fs/jffs2/gc.c:1147:29: warning: symbol 'jeb' shadows an earlier one
fs/jffs2/gc.c:1084:89: originally declared here
fs/jffs2/gc.c:1197:29: warning: symbol 'jeb' shadows an earlier one
fs/jffs2/gc.c:1084:89: originally declared here

Add an sb_ prefix to the inner jeb variables as they are taken from
the super_blocks list.

It appears jffs2_garbage_collect_dnode never uses its jeb argument,
so as an alternative that could be dropped and the one caller adusted
then the inner variables would not need to be touched.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 fs/jffs2/gc.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index 32ff037..855ca05 100644
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -1144,24 +1144,24 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era
 				   If not, cover it anyway. */
 
 				struct jffs2_raw_node_ref *raw = frag->node->raw;
-				struct jffs2_eraseblock *jeb;
+				struct jffs2_eraseblock *sb_jeb;
 
-				jeb = &c->blocks[raw->flash_offset / c->sector_size];
+				sb_jeb = &c->blocks[raw->flash_offset / c->sector_size];
 
-				if (jeb == c->gcblock) {
+				if (sb_jeb == c->gcblock) {
 					D1(printk(KERN_DEBUG "Expanding down to cover frag (0x%x-0x%x) in gcblock at %08x\n",
 						  frag->ofs, frag->ofs+frag->size, ref_offset(raw)));
 					start = frag->ofs;
 					break;
 				}
-				if (!ISDIRTY(jeb->dirty_size + jeb->wasted_size)) {
+				if (!ISDIRTY(sb_jeb->dirty_size + sb_jeb->wasted_size)) {
 					D1(printk(KERN_DEBUG "Not expanding down to cover frag (0x%x-0x%x) in clean block %08x\n",
-						  frag->ofs, frag->ofs+frag->size, jeb->offset));
+						  frag->ofs, frag->ofs+frag->size, sb_jeb->offset));
 					break;
 				}
 
 				D1(printk(KERN_DEBUG "Expanding down to cover frag (0x%x-0x%x) in dirty block %08x\n",
-						  frag->ofs, frag->ofs+frag->size, jeb->offset));
+						  frag->ofs, frag->ofs+frag->size, sb_jeb->offset));
 				start = frag->ofs;
 				break;
 			}
@@ -1194,24 +1194,24 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era
 				   If not, cover it anyway. */
 
 				struct jffs2_raw_node_ref *raw = frag->node->raw;
-				struct jffs2_eraseblock *jeb;
+				struct jffs2_eraseblock *sb_jeb;
 
-				jeb = &c->blocks[raw->flash_offset / c->sector_size];
+				sb_jeb = &c->blocks[raw->flash_offset / c->sector_size];
 
-				if (jeb == c->gcblock) {
+				if (sb_jeb == c->gcblock) {
 					D1(printk(KERN_DEBUG "Expanding up to cover frag (0x%x-0x%x) in gcblock at %08x\n",
 						  frag->ofs, frag->ofs+frag->size, ref_offset(raw)));
 					end = frag->ofs + frag->size;
 					break;
 				}
-				if (!ISDIRTY(jeb->dirty_size + jeb->wasted_size)) {
+				if (!ISDIRTY(sb_jeb->dirty_size + sb_jeb->wasted_size)) {
 					D1(printk(KERN_DEBUG "Not expanding up to cover frag (0x%x-0x%x) in clean block %08x\n",
-						  frag->ofs, frag->ofs+frag->size, jeb->offset));
+						  frag->ofs, frag->ofs+frag->size, sb_jeb->offset));
 					break;
 				}
 
 				D1(printk(KERN_DEBUG "Expanding up to cover frag (0x%x-0x%x) in dirty block %08x\n",
-						  frag->ofs, frag->ofs+frag->size, jeb->offset));
+						  frag->ofs, frag->ofs+frag->size, sb_jeb->offset));
 				end = frag->ofs + frag->size;
 				break;
 			}
-- 
1.5.4.1.1278.gc75be


                 reply	other threads:[~2008-02-16  3:23 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1203132137.7442.35.camel@brick \
    --to=harvey.harrison@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox