Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel...

Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
	fs/btrfs/extent_io.c

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

diff --cc fs/btrfs/ctree.h
index 67ef9d1,557fd95..baa4031
--- 1/fs/btrfs/ctree.h
--- 2/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@@ -4126,6 -4127,17 +4127,15 @@@ static inline int btrfs_defrag_cancelle
  /* Sanity test specific functions */
  #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
  void btrfs_test_destroy_inode(struct inode *inode);
 -int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,
 -                             u64 rfer, u64 excl);
  #endif
  
+ static inline int btrfs_test_is_dummy_root(struct btrfs_root *root)
+ {
+ #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
+       if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))
+               return 1;
+ #endif
+       return 0;
+ }
+ 
  #endif

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/extent_io.c
index 215603b,3359969..bf3f424
--- 1/fs/btrfs/extent_io.c
--- 2/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -3735,11 -3674,8 +3735,11 @@@ static noinline_for_stack int write_one
        }
  
        if (unlikely(ret)) {
 -              for (; i < num_pages; i++)
 -                      unlock_page(eb->pages[i]);
 +              for (; i < num_pages; i++) {
-                       struct page *p = extent_buffer_page(eb, i);
++                      struct page *p = eb->pages[i];
 +                      clear_page_dirty_for_io(p);
 +                      unlock_page(p);
 +              }
        }
  
        return ret;

diff --cc fs/btrfs/extent_io.h
Simple merge

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

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

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

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