From: David Sterba <dsterba@suse.com>
Date: Mon, 16 May 2016 13:46:24 +0000 (+0200)
Subject: Merge branch 'cleanups-4.7' into for-chris-4.7-20160516
X-Git-Tag: v4.7-rc1~85^2~1^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5ef64a3e757c94b2f2fc61465ef9603aaacaecff;p=linux.git

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

5ef64a3e757c94b2f2fc61465ef9603aaacaecff
diff --cc fs/btrfs/disk-io.c
index 070c1dad42bd,4931d3856aa3..91d123938cef
--- a/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/super.c
index fe03efb5bec0,957976d9d627..bc060cf2675c
--- a/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();