From: Chris Mason <clm@fb.com>
Date: Tue, 17 May 2016 21:43:19 +0000 (-0700)
Subject: Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanan... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c315ef8d9db7f1a0ebd023a395ebdfde1c68057e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-chris-4.7' of git://git./linux/kernel/git/fdmanana/linux into for-linus-4.7

Signed-off-by: Chris Mason <clm@fb.com>
---

c315ef8d9db7f1a0ebd023a395ebdfde1c68057e
diff --cc fs/btrfs/dev-replace.c
index 1f193f742f21,3371f9e546d9..85f12e6e28d2
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@@ -383,9 -401,9 +383,9 @@@ int btrfs_dev_replace_start(struct btrf
  
  	ret = btrfs_sysfs_add_device_link(tgt_device->fs_devices, tgt_device);
  	if (ret)
 -		btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret);
 +		btrfs_err(fs_info, "kobj add dev failed %d\n", ret);
  
- 	btrfs_wait_ordered_roots(fs_info, -1);
+ 	btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1);
  
  	/* force writing the updated state information to disk */
  	trans = btrfs_start_transaction(root, 0);