Merge branch 'anand/sysfs-updates-v4.3-rc3' of git://git.kernel.org/pub/scm/linux...

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

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

diff --cc fs/btrfs/dev-replace.c
index ede1c1a,0978e52..a64ca94
--- 1/fs/btrfs/dev-replace.c
--- 2/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@@ -375,12 -375,8 +375,8 @@@ int btrfs_dev_replace_start(struct btrf
        WARN_ON(!tgt_device);
        dev_replace->tgtdev = tgt_device;
  
-       ret = btrfs_kobj_add_device(tgt_device->fs_devices, tgt_device);
-       if (ret)
-               btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret);
- 
 -      printk_in_rcu(KERN_INFO
 -                    "BTRFS: dev_replace from %s (devid %llu) to %s started\n",
 +      btrfs_info_in_rcu(root->fs_info,
 +                    "dev_replace from %s (devid %llu) to %s started",
                      src_device->missing ? "<missing disk>" :
                        rcu_str_deref(src_device->name),
                      src_device->devid,

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

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

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

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

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

diff --cc fs/btrfs/volumes.c
index 7ad310c,5688b78..dd644d7
--- 1/fs/btrfs/volumes.c
--- 2/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@@ -2350,10 -2320,9 +2320,10 @@@ int btrfs_init_new_device(struct btrfs_
                 */
                snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU",
                                                root->fs_info->fsid);
-               if (kobject_rename(&root->fs_info->fs_devices->super_kobj,
+               if (kobject_rename(&root->fs_info->fs_devices->fsid_kobj,
                                                                fsid_buf))
 -                      pr_warn("BTRFS: sysfs: failed to create fsid for sprout\n");
 +                      btrfs_warn(root->fs_info,
 +                              "sysfs: failed to create fsid for sprout");
        }
  
        root->fs_info->num_tolerated_disk_barrier_failures =