From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Mon, 18 May 2015 16:37:35 -0400 (EDT) Subject: [Cluster-devel] [PATCH V2 linux-next] gfs2: fix shadow warning in gfs2_rbm_find() In-Reply-To: <1431975184-1096-1-git-send-email-fabf@skynet.be> References: <1431975184-1096-1-git-send-email-fabf@skynet.be> Message-ID: <661277919.1072061.1431981455435.JavaMail.zimbra@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit ----- Original Message ----- > bi was already declared and initialized globally in gfs2_rbm_find() > > Suggested-by: Bob Peterson > Signed-off-by: Fabian Frederick > --- > V2: use global bi instead of new call to rbm_bi() > on local variable. > > 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.4.0 Hi, Thanks. This is now applied to the for-next branch of the linux-gfs2 tree: https://git.kernel.org/cgit/linux/kernel/git/gfs2/linux-gfs2.git/commit/fs/gfs2?h=for-next&id=a3e3213676d8208328ef9f79936f94e583c0ec90 Regards, Bob Peterson Red Hat File Systems