Merge branch 'sysfs-fsdevices-4.2-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into anand

1 files changed, 17 insertions, 2 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index b7fa3bac2cff..b977fc8d8201 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2497,7 +2497,6 @@ int open_ctree(struct super_block *sb,
         seqlock_init(&fs_info->profiles_lock);
         init_rwsem(&fs_info->delayed_iput_sem);
 
-        init_completion(&fs_info->kobj_unregister);
         INIT_LIST_HEAD(&fs_info->dirty_cowonly_roots);
         INIT_LIST_HEAD(&fs_info->space_info);
         INIT_LIST_HEAD(&fs_info->tree_mod_seq_list);
@@ -2877,10 +2876,22 @@ retry_root_backup:
 
         btrfs_close_extra_devices(fs_devices, 1);
 
+        ret = btrfs_sysfs_add_fsid(fs_devices, NULL);
+        if (ret) {
+                pr_err("BTRFS: failed to init sysfs fsid interface: %d\n", ret);
+                goto fail_block_groups;
+        }
+
+        ret = btrfs_sysfs_add_device(fs_devices);
+        if (ret) {
+                pr_err("BTRFS: failed to init sysfs device interface: %d\n", ret);
+                goto fail_fsdev_sysfs;
+        }
+
         ret = btrfs_sysfs_add_one(fs_info);
         if (ret) {
                 pr_err("BTRFS: failed to init sysfs interface: %d\n", ret);
-                goto fail_block_groups;
+                goto fail_fsdev_sysfs;
         }
 
         ret = btrfs_init_space_info(fs_info);
@@ -3058,6 +3069,9 @@ fail_cleaner:
 fail_sysfs:
         btrfs_sysfs_remove_one(fs_info);
 
+fail_fsdev_sysfs:
+        btrfs_sysfs_remove_fsid(fs_info->fs_devices);
+
 fail_block_groups:
         btrfs_put_block_group_cache(fs_info);
         btrfs_free_block_groups(fs_info);
@@ -3735,6 +3749,7 @@ void close_ctree(struct btrfs_root *root)
         }
 
         btrfs_sysfs_remove_one(fs_info);
+        btrfs_sysfs_remove_fsid(fs_info->fs_devices);
 
         btrfs_free_fs_roots(fs_info);