From: Chris Mason Date: Wed, 20 Feb 2013 19:05:45 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs... X-Git-Tag: v5.15~20354^2~57 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'master' of git://git./linux/kernel/git/josef/btrfs-next into for-linus-3.9 Signed-off-by: Chris Mason Conflicts: fs/btrfs/disk-io.c --- b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b diff --cc fs/btrfs/disk-io.c index a8f652d,39ff34a..779b401 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@@ -3466,11 -3484,11 +3484,11 @@@ static void __btrfs_btree_balance_dirty if (flush_delayed) btrfs_balance_delayed_items(root); - num_dirty = root->fs_info->dirty_metadata_bytes; - - if (num_dirty > thresh) { + ret = percpu_counter_compare(&root->fs_info->dirty_metadata_bytes, + BTRFS_DIRTY_METADATA_THRESH); + if (ret > 0) { - balance_dirty_pages_ratelimited_nr( - root->fs_info->btree_inode->i_mapping, 1); + balance_dirty_pages_ratelimited( + root->fs_info->btree_inode->i_mapping); } return; } diff --cc fs/btrfs/ordered-data.h index f29d4bf5,267ac99..8eadfe4 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h @@@ -76,9 -76,11 +76,11 @@@ struct btrfs_ordered_sum #define BTRFS_ORDERED_IOERR 6 /* We had an io error when writing this out */ -#define BTRFS_ORDERED_UPDATED_ISIZE 7 /* indicates wether this ordered extent +#define BTRFS_ORDERED_UPDATED_ISIZE 7 /* indicates whether this ordered extent * has done its due diligence in updating * the isize. */ + #define BTRFS_ORDERED_LOGGED_CSUM 8 /* We've logged the csums on this ordered + ordered extent */ struct btrfs_ordered_extent { /* logical offset in the file */