Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5b0b11c authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman
Browse files

btrfs: remove unused variable in btrfs_{start,write}_dirty_block_groups() 

commit 6d4a6b515c39f1f8763093e0f828959b2fbc2f45 upstream.

Clang's version of -Wunused-but-set-variable recently gained support for
unary operations, which reveals two unused variables:

  fs/btrfs/block-group.c:2949:6: error: variable 'num_started' set but not used [-Werror,-Wunused-but-set-variable]
          int num_started = 0;
              ^
  fs/btrfs/block-group.c:3116:6: error: variable 'num_started' set but not used [-Werror,-Wunused-but-set-variable]
          int num_started = 0;
              ^
  2 errors generated.

These variables appear to be unused from their introduction, so just
remove them to silence the warnings.

Fixes: c9dc4c65 ("Btrfs: two stage dirty block group writeout")
Fixes: 1bbc621e ("Btrfs: allow block group cache writeout outside critical section in commit")
CC: stable@vger.kernel.org # 5.4+
Link: https://github.com/ClangBuiltLinux/linux/issues/1614


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0aad6733

fs/btrfs/block-group.c

+0 −4
Original line number Diff line number Diff line
@@ -2388,7 +2388,6 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans) 
	struct btrfs_path *path = NULL;

	LIST_HEAD(dirty);

	struct list_head *io = &cur_trans->io_bgs;

	int num_started = 0;

	int loops = 0;



	spin_lock(&cur_trans->dirty_bgs_lock);
@@ -2455,7 +2454,6 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans) 
			cache->io_ctl.inode = NULL;

			ret = btrfs_write_out_cache(trans, cache, path);

			if (ret == 0 && cache->io_ctl.inode) {

				num_started++;

				should_put = 0;



				/*
@@ -2556,7 +2554,6 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans) 
	int should_put;

	struct btrfs_path *path;

	struct list_head *io = &cur_trans->io_bgs;

	int num_started = 0;



	path = btrfs_alloc_path();

	if (!path)
@@ -2614,7 +2611,6 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans) 
			cache->io_ctl.inode = NULL;

			ret = btrfs_write_out_cache(trans, cache, path);

			if (ret == 0 && cache->io_ctl.inode) {

				num_started++;

				should_put = 0;

				list_add_tail(&cache->io_list, io);

			} else {