Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992511AbbEOVSC (ORCPT ); Fri, 15 May 2015 17:18:02 -0400 Received: from mailrelay101.isp.belgacom.be ([195.238.20.128]:64331 "EHLO mailrelay101.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422770AbbEOVR7 (ORCPT ); Fri, 15 May 2015 17:17:59 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=aVuRYB9jFzFsbHnyIO6WTXMsFsysg296qeRS+2aVNsk= c=1 sm=2 a=Y4DVwEryvGMNJ9KalEoA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DgDwCwYVZV/yMoQ1dcgxCBMrJbBwEBAQEFAYEEmE2BNk0BAQEBAQGBC0EDhAwvI4EaN4gwAddQLIYWiikdhBcFnVSMf4oAI2FmAYIyPDGCRgEBAQ From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Steven Whitehouse , Bob Peterson , cluster-devel@redhat.com Subject: [PATCH 1/1 linux-next] gfs2: fix shadow warning in gfs2_rbm_find() Date: Fri, 15 May 2015 23:17:54 +0200 Message-Id: <1431724674-29419-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1114 Lines: 34 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/