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

Commit d814a491 authored by Ethan Lien's avatar Ethan Lien Committed by David Sterba
Browse files

btrfs: use correct compare function of dirty_metadata_bytes 



We use customized, nodesize batch value to update dirty_metadata_bytes.
We should also use batch version of compare function or we will easily
goto fast path and get false result from percpu_counter_compare().

Fixes: e2d84521 ("Btrfs: use percpu counter for dirty metadata count")
CC: stable@vger.kernel.org # 4.4+
Signed-off-by: default avatarEthan Lien <ethanlien@synology.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 36350e95

fs/btrfs/disk-io.c

+6 −4
Original line number Diff line number Diff line
@@ -959,8 +959,9 @@ static int btree_writepages(struct address_space *mapping, 


		fs_info = BTRFS_I(mapping->host)->root->fs_info;

		/* this is a bit racy, but that's ok */

		ret = percpu_counter_compare(&fs_info->dirty_metadata_bytes,

					     BTRFS_DIRTY_METADATA_THRESH);

		ret = __percpu_counter_compare(&fs_info->dirty_metadata_bytes,

					     BTRFS_DIRTY_METADATA_THRESH,

					     fs_info->dirty_metadata_batch);

		if (ret < 0)

			return 0;

	}
@@ -4134,8 +4135,9 @@ static void __btrfs_btree_balance_dirty(struct btrfs_fs_info *fs_info, 
	if (flush_delayed)

		btrfs_balance_delayed_items(fs_info);



	ret = percpu_counter_compare(&fs_info->dirty_metadata_bytes,

				     BTRFS_DIRTY_METADATA_THRESH);

	ret = __percpu_counter_compare(&fs_info->dirty_metadata_bytes,

				     BTRFS_DIRTY_METADATA_THRESH,

				     fs_info->dirty_metadata_batch);

	if (ret > 0) {

		balance_dirty_pages_ratelimited(fs_info->btree_inode->i_mapping);

	}