Merge branch 'cleanups-4.7' into for-chris-4.7-20160516

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

diff --cc fs/btrfs/disk-io.c
index 070c1dad42bd5a62810aaf3d60ff3b4455af3ecb,4931d3856aa3bce9127300a51f4819f1e439be1c..91d123938cef2db8be94337a534e7a62be714c2a
--- 1/fs/btrfs/disk-io.c
--- 2/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@@ -3064,11 -3054,13 +3062,11 @@@ retry_root_backup
                ret = btrfs_cleanup_fs_roots(fs_info);
                if (ret)
                        goto fail_qgroup;
 -
 -              mutex_lock(&fs_info->cleaner_mutex);
 +              /* We locked cleaner_mutex before creating cleaner_kthread. */
                ret = btrfs_recover_relocation(tree_root);
 -              mutex_unlock(&fs_info->cleaner_mutex);
                if (ret < 0) {
-                       printk(KERN_WARNING
-                              "BTRFS: failed to recover relocation\n");
+                       btrfs_warn(fs_info, "failed to recover relocation: %d",
+                                       ret);
                        err = -EINVAL;
                        goto fail_qgroup;
                }

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

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

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

diff --cc fs/btrfs/super.c
index fe03efb5bec0a218988f7d0cce6c1d96eb12056e,957976d9d627bddf67b729d67e1e0c075578ad12..bc060cf2675cae09c06b6c6ecab7874c622ace14
--- 1/fs/btrfs/super.c
--- 2/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -2051,10 -2047,9 +2047,10 @@@ static int btrfs_statfs(struct dentry *
        struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv;
        int ret;
        u64 thresh = 0;
 +      int mixed = 0;
  
        /*
-        * holding chunk_muext to avoid allocating new chunks, holding
+        * holding chunk_mutex to avoid allocating new chunks, holding
         * device_list_mutex to avoid the device being removed
         */
        rcu_read_lock();

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

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