From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Thu, 25 Jun 2015 12:42:33 -0500 Subject: [Cluster-devel] [PATCH 10/16] gfs2: fix shadow warning in gfs2_rbm_find() In-Reply-To: <1435254159-20788-1-git-send-email-rpeterso@redhat.com> References: <1435254159-20788-1-git-send-email-rpeterso@redhat.com> Message-ID: <1435254159-20788-11-git-send-email-rpeterso@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Fabian Frederick bi was already declared and initialized globally in gfs2_rbm_find() Signed-off-by: Fabian Frederick Signed-off-by: Bob Peterson --- fs/gfs2/rgrp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 900e515..cd53d6e 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; -- 2.1.0