[Cluster-devel] [PATCH 1/1 linux-next] gfs2: fix shadow warning in gfs2_rbm_find()

[Bob Peterson <rpeterso@redhat.com>]

----- Original Message -----
> 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 <fabf@skynet.be>
> ---
>  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

Hi,

In this case, I think it makes more sense to just eliminate the extra
declare of bi and just use the function-global bi to set GBF_FULL.

Regards,

Bob Peterson
Red Hat File Systems