Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
	fs/btrfs/disk-io.c

diff --cc fs/btrfs/disk-io.c
index a8f652dc940bd85148dad48c11d2d893aefe32ba,39ff34a62a245ba005356c1e3eae1890d4f7d641..779b401cd952526c6495fada08941611d304e7c8
--- 1/fs/btrfs/disk-io.c
--- 2/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/extent-tree.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc fs/btrfs/ordered-data.h
index f29d4bf5fbe70dee3990874be8d9975c937f3477,267ac99095f63fe6a6855f6f97f97c40d0e7e501..8eadfe406cdd345263fb0bcf60841cd6801a89bb
--- 1/fs/btrfs/ordered-data.h
--- 2/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 */

diff --cc include/uapi/linux/Kbuild
Simple merge