Merge branch 'for-linus2' of git://git.kernel.dk/linux-2.6-block

[safe/jmp/linux-2.6] / fs / btrfs / sysfs.c

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index cd673ca..4ce16ef 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -67,7 +67,8 @@ struct btrfs_root_attr {
 };
 
 #define ROOT_ATTR(name, mode, show, store) \
-static struct btrfs_root_attr btrfs_root_attr_##name = __ATTR(name, mode, show, store)
+static struct btrfs_root_attr btrfs_root_attr_##name = __ATTR(name, mode, \
+                                                             show, store)
 
 ROOT_ATTR(blocks_used, 0444,   root_blocks_used_show,  NULL);
 ROOT_ATTR(block_limit, 0644,   root_block_limit_show,  NULL);
@@ -86,7 +87,8 @@ struct btrfs_super_attr {
 };
 
 #define SUPER_ATTR(name, mode, show, store) \
-static struct btrfs_super_attr btrfs_super_attr_##name = __ATTR(name, mode, show, store)
+static struct btrfs_super_attr btrfs_super_attr_##name = __ATTR(name, mode, \
+                                                               show, store)
 
 SUPER_ATTR(blocks_used,                0444,   super_blocks_used_show,         NULL);
 SUPER_ATTR(total_blocks,       0444,   super_total_blocks_show,        NULL);
@@ -162,12 +164,12 @@ static void btrfs_root_release(struct kobject *kobj)
        complete(&root->kobj_unregister);
 }
 
-static struct sysfs_ops btrfs_super_attr_ops = {
+static const struct sysfs_ops btrfs_super_attr_ops = {
        .show   = btrfs_super_attr_show,
        .store  = btrfs_super_attr_store,
 };
 
-static struct sysfs_ops btrfs_root_attr_ops = {
+static const struct sysfs_ops btrfs_root_attr_ops = {
        .show   = btrfs_root_attr_show,
        .store  = btrfs_root_attr_store,
 };
@@ -184,7 +186,8 @@ static struct kobj_type btrfs_super_ktype = {
        .release        = btrfs_super_release,
 };
 
-static struct kset btrfs_kset;
+/* /sys/fs/btrfs/ entry */
+static struct kset *btrfs_kset;
 
 int btrfs_sysfs_add_super(struct btrfs_fs_info *fs)
 {
@@ -208,22 +211,16 @@ int btrfs_sysfs_add_super(struct btrfs_fs_info *fs)
        }
        name[len] = '\0';
 
-       fs->super_kobj.kset = &btrfs_kset;
-       fs->super_kobj.ktype = &btrfs_super_ktype;
-
-       error = kobject_set_name(&fs->super_kobj, "%s", name);
-       if (error)
-               goto fail;
-
-       error = kobject_register(&fs->super_kobj);
+       fs->super_kobj.kset = btrfs_kset;
+       error = kobject_init_and_add(&fs->super_kobj, &btrfs_super_ktype,
+                                    NULL, "%s", name);
+       kfree(name);
        if (error)
                goto fail;
 
-       kfree(name);
        return 0;
 
 fail:
-       kfree(name);
        printk(KERN_ERR "btrfs: sysfs creation for super failed\n");
        return error;
 }
@@ -232,15 +229,9 @@ int btrfs_sysfs_add_root(struct btrfs_root *root)
 {
        int error;
 
-       root->root_kobj.ktype = &btrfs_root_ktype;
-       root->root_kobj.parent = &root->fs_info->super_kobj;
-
-       error = kobject_set_name(&root->root_kobj, "%s", root->name);
-       if (error) {
-               goto fail;
-       }
-
-       error = kobject_register(&root->root_kobj);
+       error = kobject_init_and_add(&root->root_kobj, &btrfs_root_ktype,
+                                    &root->fs_info->super_kobj,
+                                    "%s", root->name);
        if (error)
                goto fail;
 
@@ -253,24 +244,26 @@ fail:
 
 void btrfs_sysfs_del_root(struct btrfs_root *root)
 {
-       kobject_unregister(&root->root_kobj);
+       kobject_put(&root->root_kobj);
        wait_for_completion(&root->kobj_unregister);
 }
 
 void btrfs_sysfs_del_super(struct btrfs_fs_info *fs)
 {
-       kobject_unregister(&fs->super_kobj);
+       kobject_put(&fs->super_kobj);
        wait_for_completion(&fs->kobj_unregister);
 }
 
-int btrfs_init_sysfs()
+int btrfs_init_sysfs(void)
 {
-       kobj_set_kset_s(&btrfs_kset, fs_subsys);
-       kobject_set_name(&btrfs_kset.kobj, "btrfs");
-       return kset_register(&btrfs_kset);
+       btrfs_kset = kset_create_and_add("btrfs", NULL, fs_kobj);
+       if (!btrfs_kset)
+               return -ENOMEM;
+       return 0;
 }
 
-void btrfs_exit_sysfs()
+void btrfs_exit_sysfs(void)
 {
-       kset_unregister(&btrfs_kset);
+       kset_unregister(btrfs_kset);
 }
+