2015-05-18 18:53:14

by Fabian Frédérick

Subject: [PATCH V2 linux-next] gfs2: fix shadow warning in gfs2_rbm_find()

bi was already declared and initialized globally in gfs2_rbm_find()

Suggested-by: Bob Peterson <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
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

2015-05-18 20:37:43

by Bob Peterson

Subject: Re: [PATCH V2 linux-next] gfs2: fix shadow warning in gfs2_rbm_find()

----- Original Message -----
> bi was already declared and initialized globally in gfs2_rbm_find()
>
> Suggested-by: Bob Peterson <[email protected]>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> 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