mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-10-31 16:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ext4: create ext4_feat kobject dynamically

Browse source 
kobjects should always be allocated dynamically, because it is unknown
to whoever creates them when kobjects can be released.

Signed-off-by: Riccardo Schirone <sirmy15@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Riccardo Schirone 2018-01-11 15:11:32 -05:00 committed by Theodore Ts'o
parent 95c4df0293
commit b99fee58a2
1 changed files with 22 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

33
fs/ext4/sysfs.c
View file

@ -11,6 +11,7 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include "ext4.h" #include "ext4.h"
@ -351,11 +352,10 @@ static struct kset ext4_kset = {
static struct kobj_type ext4_feat_ktype = { static struct kobj_type ext4_feat_ktype = {
.default_attrs = ext4_feat_attrs, .default_attrs = ext4_feat_attrs,
.sysfs_ops = &ext4_attr_ops, .sysfs_ops = &ext4_attr_ops,
.release = (void (*)(struct kobject *))kfree,
}; };
static struct kobject ext4_feat = { static struct kobject *ext4_feat;
.kset = &ext4_kset,
};
#define PROC_FILE_SHOW_DEFN(name) \ #define PROC_FILE_SHOW_DEFN(name) \
static int name##_open(struct inode *inode, struct file *file) \ static int name##_open(struct inode *inode, struct file *file) \
@ -438,20 +438,31 @@ int __init ext4_init_sysfs(void)
return ret; return ret;
} }
ret = kobject_init_and_add(&ext4_feat, &ext4_feat_ktype, ext4_feat = kzalloc(sizeof(*ext4_feat), GFP_KERNEL);
NULL, "features"); if (!ext4_feat) {
if (ret) { ret = -ENOMEM;
kobject_put(&ext4_feat); goto kset_err;
kset_unregister(&ext4_kset);
} else {
ext4_proc_root = proc_mkdir(proc_dirname, NULL);
} }
ext4_feat->kset = &ext4_kset;
ret = kobject_init_and_add(ext4_feat, &ext4_feat_ktype,
NULL, "features");
if (ret)
goto feat_err;
ext4_proc_root = proc_mkdir(proc_dirname, NULL);
return ret;
feat_err:
kobject_put(ext4_feat);
kset_err:
kset_unregister(&ext4_kset);
return ret; return ret;
} }
void ext4_exit_sysfs(void) void ext4_exit_sysfs(void)
{ {
kobject_put(&ext4_feat); kobject_put(ext4_feat);
kset_unregister(&ext4_kset); kset_unregister(&ext4_kset);
remove_proc_entry(proc_dirname, NULL); remove_proc_entry(proc_dirname, NULL);
ext4_proc_root = NULL; ext4_proc_root = NULL;