Skip to content

Commit d92fa5e

Browse files
Ethan Liengregkh
authored andcommitted
btrfs: use correct compare function of dirty_metadata_bytes
commit d814a49 upstream. 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: e2d8452 ("Btrfs: use percpu counter for dirty metadata count") CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Ethan Lien <ethanlien@synology.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> nb: Rebased on 4.4.y ] Signed-off-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d1f7cdc commit d92fa5e

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

fs/btrfs/disk-io.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,9 @@ static int btree_writepages(struct address_space *mapping,
10961096

10971097
fs_info = BTRFS_I(mapping->host)->root->fs_info;
10981098
/* this is a bit racy, but that's ok */
1099-
ret = percpu_counter_compare(&fs_info->dirty_metadata_bytes,
1100-
BTRFS_DIRTY_METADATA_THRESH);
1099+
ret = __percpu_counter_compare(&fs_info->dirty_metadata_bytes,
1100+
BTRFS_DIRTY_METADATA_THRESH,
1101+
fs_info->dirty_metadata_batch);
11011102
if (ret < 0)
11021103
return 0;
11031104
}
@@ -4107,8 +4108,9 @@ static void __btrfs_btree_balance_dirty(struct btrfs_root *root,
41074108
if (flush_delayed)
41084109
btrfs_balance_delayed_items(root);
41094110

4110-
ret = percpu_counter_compare(&root->fs_info->dirty_metadata_bytes,
4111-
BTRFS_DIRTY_METADATA_THRESH);
4111+
ret = __percpu_counter_compare(&root->fs_info->dirty_metadata_bytes,
4112+
BTRFS_DIRTY_METADATA_THRESH,
4113+
root->fs_info->dirty_metadata_batch);
41124114
if (ret > 0) {
41134115
balance_dirty_pages_ratelimited(
41144116
root->fs_info->btree_inode->i_mapping);

0 commit comments

Comments
 (0)