simplify-object-usage

   1 ext4: simplify kobject usage
   2
   3 From: Tyson Nottingham <tgnottingham@gmail.com>
   4
   5 Replace kset with generic kobject provided by kobject_create_and_add(),
   6 since the latter is sufficient.
   7
   8 Signed-off-by: Tyson Nottingham <tgnottingham@gmail.com>
   9 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  10 ---
  11
  12 As far as I can tell, we're not using any kset-specific functionality
  13 here, so replace it with the simpler generic kobject.
  14
  15 ---
  16  fs/ext4/sysfs.c | 45 ++++++++++++---------------------------------
  17  1 file changed, 12 insertions(+), 33 deletions(-)
  18
  19 diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
  20 index 3b6b3ab..9ebd26c 100644
  21 --- a/fs/ext4/sysfs.c
  22 +++ b/fs/ext4/sysfs.c
  23 @@ -325,13 +325,6 @@ static void ext4_sb_release(struct kobject *kobj)
  24         complete(&sbi->s_kobj_unregister);
  25  }
  26
  27 -static void ext4_kset_release(struct kobject *kobj)
  28 -{
  29 -       struct kset *kset = container_of(kobj, struct kset, kobj);
  30 -
  31 -       kfree(kset);
  32 -}
  33 -
  34  static const struct sysfs_ops ext4_attr_ops = {
  35         .show   = ext4_attr_show,
  36         .store  = ext4_attr_store,
  37 @@ -343,19 +336,14 @@ static struct kobj_type ext4_sb_ktype = {
  38         .release        = ext4_sb_release,
  39  };
  40
  41 -static struct kobj_type ext4_ktype = {
  42 -       .sysfs_ops      = &ext4_attr_ops,
  43 -       .release        = ext4_kset_release,
  44 -};
  45 -
  46 -static struct kset *ext4_kset;
  47 -
  48  static struct kobj_type ext4_feat_ktype = {
  49         .default_attrs  = ext4_feat_attrs,
  50         .sysfs_ops      = &ext4_attr_ops,
  51         .release        = (void (*)(struct kobject *))kfree,
  52  };
  53
  54 +static struct kobject *ext4_root;
  55 +
  56  static struct kobject *ext4_feat;
  57
  58  #define PROC_FILE_SHOW_DEFN(name) \
  59 @@ -393,9 +381,8 @@ int ext4_register_sysfs(struct super_block *sb)
  60         const struct ext4_proc_files *p;
  61         int err;
  62
  63 -       sbi->s_kobj.kset = ext4_kset;
  64         init_completion(&sbi->s_kobj_unregister);
  65 -       err = kobject_init_and_add(&sbi->s_kobj, &ext4_sb_ktype, NULL,
  66 +       err = kobject_init_and_add(&sbi->s_kobj, &ext4_sb_ktype, ext4_root,
  67                                    "%s", sb->s_id);
  68         if (err) {
  69                 kobject_put(&sbi->s_kobj);
  70 @@ -431,26 +418,18 @@ int __init ext4_init_sysfs(void)
  71  {
  72         int ret;
  73
  74 -       ext4_kset = kzalloc(sizeof(*ext4_kset), GFP_KERNEL);
  75 -       if (!ext4_kset)
  76 +       ext4_root = kobject_create_and_add("ext4", fs_kobj);
  77 +       if (!ext4_root)
  78                 return -ENOMEM;
  79
  80 -       kobject_set_name(&ext4_kset->kobj, "ext4");
  81 -       ext4_kset->kobj.parent = fs_kobj;
  82 -       ext4_kset->kobj.ktype = &ext4_ktype;
  83 -       ret = kset_register(ext4_kset);
  84 -       if (ret)
  85 -               goto kset_err;
  86 -
  87         ext4_feat = kzalloc(sizeof(*ext4_feat), GFP_KERNEL);
  88         if (!ext4_feat) {
  89                 ret = -ENOMEM;
  90 -               goto kset_err;
  91 +               goto root_err;
  92         }
  93
  94 -       ext4_feat->kset = ext4_kset;
  95         ret = kobject_init_and_add(ext4_feat, &ext4_feat_ktype,
  96 -                                  NULL, "features");
  97 +                                  ext4_root, "features");
  98         if (ret)
  99                 goto feat_err;
 100
 101 @@ -460,9 +439,9 @@ int __init ext4_init_sysfs(void)
 102  feat_err:
 103         kobject_put(ext4_feat);
 104         ext4_feat = NULL;
 105 -kset_err:
 106 -       kset_unregister(ext4_kset);
 107 -       ext4_kset = NULL;
 108 +root_err:
 109 +       kobject_put(ext4_root);
 110 +       ext4_root = NULL;
 111         return ret;
 112  }
 113
 114 @@ -470,8 +449,8 @@ void ext4_exit_sysfs(void)
 115  {
 116         kobject_put(ext4_feat);
 117         ext4_feat = NULL;
 118 -       kset_unregister(ext4_kset);
 119 -       ext4_kset = NULL;
 120 +       kobject_put(ext4_root);
 121 +       ext4_root = NULL;
 122         remove_proc_entry(proc_dirname, NULL);
 123         ext4_proc_root = NULL;
 124  }
 125 --
 126 2.7.4
 127
 128