From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabian Frederick Date: Fri, 15 May 2015 23:17:54 +0200 Subject: [Cluster-devel] [PATCH 1/1 linux-next] gfs2: fix shadow warning in gfs2_rbm_find() Message-ID: <1431724674-29419-1-git-send-email-fabf@skynet.be> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit bi was already declared globally in gfs2_rbm_find() Use bi_full for this variable in "Mark bitmap as full and fall through" context. Also add blank line after declaration. Signed-off-by: Fabian Frederick --- fs/gfs2/rgrp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 900e515..fa47af9 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -1712,8 +1712,9 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext, bitmap_full: /* Mark bitmap as full and fall through */ if ((state == GFS2_BLKST_FREE) && initial_offset == 0) { - struct gfs2_bitmap *bi = rbm_bi(rbm); - set_bit(GBF_FULL, &bi->bi_flags); + struct gfs2_bitmap *bi_full = rbm_bi(rbm); + + set_bit(GBF_FULL, &bi_full->bi_flags); } next_bitmap: /* Find next bitmap in the rgrp */ -- 2.4.0