diff mbox series

xfs: Remove the redundant assignment

Message ID 20220520040518.73957-1-jiapeng.chong@linux.alibaba.com (mailing list archive)
State New, archived
Headers show
Series xfs: Remove the redundant assignment | expand

Commit Message

Jiapeng Chong May 20, 2022, 4:05 a.m. UTC 
Variable 'ifree','freeblks' and 'itotal' set but not used.

Eliminate the follow clang warning:

fs/xfs/xfs_log_recover.c:3534:12: warning: variable 'freeblks' set but
not used [-Wunused-but-set-variable].

fs/xfs/xfs_log_recover.c:3535:12: warning: variable 'itotal' set but not
used [-Wunused-but-set-variable].

fs/xfs/xfs_log_recover.c:3536:12: warning: variable 'ifree'
set but not used [-Wunused-but-set-variable].

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/xfs/xfs_log_recover.c | 12 ------------
 1 file changed, 12 deletions(-)

Comments

Dave Chinner May 20, 2022, 4:37 a.m. UTC | #1 
On Fri, May 20, 2022 at 12:05:18PM +0800, Jiapeng Chong wrote:
> Variable 'ifree','freeblks' and 'itotal' set but not used.
> 
> Eliminate the follow clang warning:
> 
> fs/xfs/xfs_log_recover.c:3534:12: warning: variable 'freeblks' set but
> not used [-Wunused-but-set-variable].
> 
> fs/xfs/xfs_log_recover.c:3535:12: warning: variable 'itotal' set but not
> used [-Wunused-but-set-variable].
> 
> fs/xfs/xfs_log_recover.c:3536:12: warning: variable 'ifree'
> set but not used [-Wunused-but-set-variable].
> 
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>

Looks like it's been that way since 2010 - commit 1414a6046ab4
("xfs: remove dead XFS_LOUD_RECOVERY code") removed the prints that
dumped the differences between the in memory counters and the
calculated values....

IOWs, this entire function is dead code and has been for 12 years
now. Can you just remove it, please?

Cheers,

Dave.
kernel test robot May 20, 2022, 1:08 p.m. UTC | #2 
Hi Jiapeng,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on xfs-linux/for-next]
[also build test WARNING on v5.18-rc7 next-20220519]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Jiapeng-Chong/xfs-Remove-the-redundant-assignment/20220520-120736
base:   https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git for-next
config: x86_64-randconfig-a005 (https://download.01.org/0day-ci/archive/20220520/202205202134.P3H4KQ7S-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project e00cbbec06c08dc616a0d52a20f678b8fbd4e304)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/890587fbe3e3934d20fcd39effdcefedd65e6b7f
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Jiapeng-Chong/xfs-Remove-the-redundant-assignment/20220520-120736
        git checkout 890587fbe3e3934d20fcd39effdcefedd65e6b7f
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash fs/xfs/

If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> fs/xfs/xfs_log_recover.c:3542:20: warning: unused variable 'agfp' [-Wunused-variable]
                           struct xfs_agf  *agfp = agfbp->b_addr;
                                            ^
>> fs/xfs/xfs_log_recover.c:3551:20: warning: unused variable 'agi' [-Wunused-variable]
                           struct xfs_agi  *agi = agibp->b_addr;
                                            ^
   2 warnings generated.


vim +/agfp +3542 fs/xfs/xfs_log_recover.c

^1da177e4c3f41 Linus Torvalds    2005-04-16  3519  
^1da177e4c3f41 Linus Torvalds    2005-04-16  3520  #if defined(DEBUG)
^1da177e4c3f41 Linus Torvalds    2005-04-16  3521  /*
^1da177e4c3f41 Linus Torvalds    2005-04-16  3522   * Read all of the agf and agi counters and check that they
^1da177e4c3f41 Linus Torvalds    2005-04-16  3523   * are consistent with the superblock counters.
^1da177e4c3f41 Linus Torvalds    2005-04-16  3524   */
e89fbb5ee1893f Christoph Hellwig 2017-11-06  3525  STATIC void
^1da177e4c3f41 Linus Torvalds    2005-04-16  3526  xlog_recover_check_summary(
9a8d2fdbb47aaa Mark Tinguely     2012-06-14  3527  	struct xlog		*log)
^1da177e4c3f41 Linus Torvalds    2005-04-16  3528  {
934933c3eec9e4 Dave Chinner      2021-06-02  3529  	struct xfs_mount	*mp = log->l_mp;
934933c3eec9e4 Dave Chinner      2021-06-02  3530  	struct xfs_perag	*pag;
e82226138b20d4 Dave Chinner      2020-12-16  3531  	struct xfs_buf		*agfbp;
e82226138b20d4 Dave Chinner      2020-12-16  3532  	struct xfs_buf		*agibp;
^1da177e4c3f41 Linus Torvalds    2005-04-16  3533  	xfs_agnumber_t		agno;
5e1be0fb1a3950 Christoph Hellwig 2008-11-28  3534  	int			error;
^1da177e4c3f41 Linus Torvalds    2005-04-16  3535  
934933c3eec9e4 Dave Chinner      2021-06-02  3536  	for_each_perag(mp, agno, pag) {
934933c3eec9e4 Dave Chinner      2021-06-02  3537  		error = xfs_read_agf(mp, NULL, pag->pag_agno, 0, &agfbp);
4805621a37d9b2 Christoph Hellwig 2008-11-28  3538  		if (error) {
a0fa2b679ecd15 Dave Chinner      2011-03-07  3539  			xfs_alert(mp, "%s agf read failed agno %d error %d",
934933c3eec9e4 Dave Chinner      2021-06-02  3540  						__func__, pag->pag_agno, error);
4805621a37d9b2 Christoph Hellwig 2008-11-28  3541  		} else {
9798f615ad2be4 Christoph Hellwig 2020-03-10 @3542  			struct xfs_agf	*agfp = agfbp->b_addr;
^1da177e4c3f41 Linus Torvalds    2005-04-16  3543  			xfs_buf_relse(agfbp);
4805621a37d9b2 Christoph Hellwig 2008-11-28  3544  		}
^1da177e4c3f41 Linus Torvalds    2005-04-16  3545  
934933c3eec9e4 Dave Chinner      2021-06-02  3546  		error = xfs_read_agi(mp, NULL, pag->pag_agno, &agibp);
a0fa2b679ecd15 Dave Chinner      2011-03-07  3547  		if (error) {
a0fa2b679ecd15 Dave Chinner      2011-03-07  3548  			xfs_alert(mp, "%s agi read failed agno %d error %d",
934933c3eec9e4 Dave Chinner      2021-06-02  3549  						__func__, pag->pag_agno, error);
a0fa2b679ecd15 Dave Chinner      2011-03-07  3550  		} else {
370c782b98436b Christoph Hellwig 2020-03-10 @3551  			struct xfs_agi	*agi = agibp->b_addr;
kernel test robot May 22, 2022, 7:25 a.m. UTC | #3 
Hi Jiapeng,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on xfs-linux/for-next]
[also build test WARNING on v5.18-rc7 next-20220520]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Jiapeng-Chong/xfs-Remove-the-redundant-assignment/20220520-120736
base:   https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git for-next
config: i386-randconfig-a005 (https://download.01.org/0day-ci/archive/20220522/202205221503.Qj3T3w3A-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-1) 11.3.0
reproduce (this is a W=1 build):
        # https://github.com/intel-lab-lkp/linux/commit/890587fbe3e3934d20fcd39effdcefedd65e6b7f
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Jiapeng-Chong/xfs-Remove-the-redundant-assignment/20220520-120736
        git checkout 890587fbe3e3934d20fcd39effdcefedd65e6b7f
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash fs/xfs/

If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

   fs/xfs/xfs_log_recover.c: In function 'xlog_recover_check_summary':
>> fs/xfs/xfs_log_recover.c:3542:42: warning: unused variable 'agfp' [-Wunused-variable]
    3542 |                         struct xfs_agf  *agfp = agfbp->b_addr;
         |                                          ^~~~
>> fs/xfs/xfs_log_recover.c:3551:42: warning: unused variable 'agi' [-Wunused-variable]
    3551 |                         struct xfs_agi  *agi = agibp->b_addr;
         |                                          ^~~


vim +/agfp +3542 fs/xfs/xfs_log_recover.c

^1da177e4c3f415 Linus Torvalds    2005-04-16  3519  
^1da177e4c3f415 Linus Torvalds    2005-04-16  3520  #if defined(DEBUG)
^1da177e4c3f415 Linus Torvalds    2005-04-16  3521  /*
^1da177e4c3f415 Linus Torvalds    2005-04-16  3522   * Read all of the agf and agi counters and check that they
^1da177e4c3f415 Linus Torvalds    2005-04-16  3523   * are consistent with the superblock counters.
^1da177e4c3f415 Linus Torvalds    2005-04-16  3524   */
e89fbb5ee1893f3 Christoph Hellwig 2017-11-06  3525  STATIC void
^1da177e4c3f415 Linus Torvalds    2005-04-16  3526  xlog_recover_check_summary(
9a8d2fdbb47aaa1 Mark Tinguely     2012-06-14  3527  	struct xlog		*log)
^1da177e4c3f415 Linus Torvalds    2005-04-16  3528  {
934933c3eec9e4a Dave Chinner      2021-06-02  3529  	struct xfs_mount	*mp = log->l_mp;
934933c3eec9e4a Dave Chinner      2021-06-02  3530  	struct xfs_perag	*pag;
e82226138b20d4f Dave Chinner      2020-12-16  3531  	struct xfs_buf		*agfbp;
e82226138b20d4f Dave Chinner      2020-12-16  3532  	struct xfs_buf		*agibp;
^1da177e4c3f415 Linus Torvalds    2005-04-16  3533  	xfs_agnumber_t		agno;
5e1be0fb1a39505 Christoph Hellwig 2008-11-28  3534  	int			error;
^1da177e4c3f415 Linus Torvalds    2005-04-16  3535  
934933c3eec9e4a Dave Chinner      2021-06-02  3536  	for_each_perag(mp, agno, pag) {
934933c3eec9e4a Dave Chinner      2021-06-02  3537  		error = xfs_read_agf(mp, NULL, pag->pag_agno, 0, &agfbp);
4805621a37d9b2b Christoph Hellwig 2008-11-28  3538  		if (error) {
a0fa2b679ecd15b Dave Chinner      2011-03-07  3539  			xfs_alert(mp, "%s agf read failed agno %d error %d",
934933c3eec9e4a Dave Chinner      2021-06-02  3540  						__func__, pag->pag_agno, error);
4805621a37d9b2b Christoph Hellwig 2008-11-28  3541  		} else {
9798f615ad2be48 Christoph Hellwig 2020-03-10 @3542  			struct xfs_agf	*agfp = agfbp->b_addr;
^1da177e4c3f415 Linus Torvalds    2005-04-16  3543  			xfs_buf_relse(agfbp);
4805621a37d9b2b Christoph Hellwig 2008-11-28  3544  		}
^1da177e4c3f415 Linus Torvalds    2005-04-16  3545  
934933c3eec9e4a Dave Chinner      2021-06-02  3546  		error = xfs_read_agi(mp, NULL, pag->pag_agno, &agibp);
a0fa2b679ecd15b Dave Chinner      2011-03-07  3547  		if (error) {
a0fa2b679ecd15b Dave Chinner      2011-03-07  3548  			xfs_alert(mp, "%s agi read failed agno %d error %d",
934933c3eec9e4a Dave Chinner      2021-06-02  3549  						__func__, pag->pag_agno, error);
a0fa2b679ecd15b Dave Chinner      2011-03-07  3550  		} else {
370c782b98436bb Christoph Hellwig 2020-03-10 @3551  			struct xfs_agi	*agi = agibp->b_addr;
diff mbox series

Patch

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 97b941c07957..47736936ebba 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3531,14 +3531,8 @@  xlog_recover_check_summary(
 	struct xfs_buf		*agfbp;
 	struct xfs_buf		*agibp;
 	xfs_agnumber_t		agno;
-	uint64_t		freeblks;
-	uint64_t		itotal;
-	uint64_t		ifree;
 	int			error;
 
-	freeblks = 0LL;
-	itotal = 0LL;
-	ifree = 0LL;
 	for_each_perag(mp, agno, pag) {
 		error = xfs_read_agf(mp, NULL, pag->pag_agno, 0, &agfbp);
 		if (error) {
@@ -3546,9 +3540,6 @@  xlog_recover_check_summary(
 						__func__, pag->pag_agno, error);
 		} else {
 			struct xfs_agf	*agfp = agfbp->b_addr;
-
-			freeblks += be32_to_cpu(agfp->agf_freeblks) +
-				    be32_to_cpu(agfp->agf_flcount);
 			xfs_buf_relse(agfbp);
 		}
 
@@ -3558,9 +3549,6 @@  xlog_recover_check_summary(
 						__func__, pag->pag_agno, error);
 		} else {
 			struct xfs_agi	*agi = agibp->b_addr;
-
-			itotal += be32_to_cpu(agi->agi_count);
-			ifree += be32_to_cpu(agi->agi_freecount);
 			xfs_buf_relse(agibp);
 		}
 	}