From: Fabian Frederick <fabf@skynet.be>
Date: Mon, 18 May 2015 20:23:03 +0000 (-0500)
Subject: gfs2: fix shadow warning in gfs2_rbm_find()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a3e3213676d8208328ef9f79936f94e583c0ec90;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

gfs2: fix shadow warning in gfs2_rbm_find()

bi was already declared and initialized globally in gfs2_rbm_find()

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
---

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 900e515bbdf6..cd53d6e9e44e 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1711,10 +1711,8 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext,
 		return ret;
 
 bitmap_full:	/* Mark bitmap as full and fall through */
-		if ((state == GFS2_BLKST_FREE) && initial_offset == 0) {
-			struct gfs2_bitmap *bi = rbm_bi(rbm);
+		if ((state == GFS2_BLKST_FREE) && initial_offset == 0)
 			set_bit(GBF_FULL, &bi->bi_flags);
-		}
 
 next_bitmap:	/* Find next bitmap in the rgrp */
 		rbm->offset = 0;