[lustre-devel] [PATCH 05/38] lustre: llite: change top kobject for llite into a kset
James Simmons
jsimmons at infradead.org
Thu Aug 16 20:10:08 PDT 2018
Currently the top of the sysfs tree for llite is represented by
a kobject and each mount instance a kset. Change the top object
into a kset and each mount instance into a kobject instead. The
reason for this change is in the future lustre_kobj will be
changed into a kset and you can't layer two ksets.
Signed-off-by: James Simmons <uja.ornl at yahoo.com>
WC-bug-id: https://jira.whamcloud.com/browse/LU-8066
Reviewed-on: https://review.whamcloud.com/24031
Reviewed-by: Bobi Jam <bobijam at hotmail.com>
Reviewed-by: Andreas Dilger <adilger at whamcloud.com>
Reviewed-by: Oleg Drokin <green at whamcloud.com>
Signed-off-by: James Simmons <jsimmons at infradead.org>
---
.../staging/lustre/lustre/llite/llite_internal.h | 2 +-
drivers/staging/lustre/lustre/llite/lproc_llite.c | 114 +++++++++++++--------
2 files changed, 72 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index 92dc05d..5577407 100644
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -523,7 +523,7 @@ struct ll_sb_info {
struct path ll_mnt;
__kernel_fsid_t ll_fsid;
- struct kobject ll_kobj; /* sysfs object */
+ struct kset ll_kset; /* sysfs object */
struct completion ll_kobj_unregister;
};
diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c
index 8e418ba..8af6636 100644
--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c
+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c
@@ -40,22 +40,42 @@
#include "llite_internal.h"
#include "vvp_internal.h"
+static struct kobject *llite_kobj;
static struct dentry *llite_root;
-static struct kset *llite_kset;
+
+static void class_sysfs_release(struct kobject *kobj)
+{
+ kfree(kobj);
+}
+
+static struct kobj_type class_ktype = {
+ .sysfs_ops = &lustre_sysfs_ops,
+ .release = class_sysfs_release,
+};
int llite_tunables_register(void)
{
+ const char *name = "llite";
+ struct kobject *kobj;
int rc = 0;
- llite_kset = kset_create_and_add("llite", NULL, lustre_kobj);
- if (!llite_kset)
+ kobj = kzalloc(sizeof(*kobj), GFP_KERNEL);
+ if (!kobj)
+ return -ENOMEM;
+
+ kobject_init(kobj, &class_ktype);
+ rc = kobject_add(kobj, lustre_kobj, "%s", name);
+ if (rc) {
+ kobject_put(kobj);
return -ENOMEM;
+ }
+ llite_kobj = kobj;
llite_root = debugfs_create_dir("llite", debugfs_lustre_root);
if (IS_ERR_OR_NULL(llite_root)) {
rc = llite_root ? PTR_ERR(llite_root) : -ENOMEM;
llite_root = NULL;
- kset_unregister(llite_kset);
+ kobject_put(kobj);
}
return rc;
@@ -63,7 +83,8 @@ int llite_tunables_register(void)
void llite_tunables_unregister(void)
{
- kset_unregister(llite_kset);
+ kobject_put(llite_kobj);
+ llite_kobj = NULL;
debugfs_remove(llite_root);
llite_root = NULL;
@@ -78,7 +99,7 @@ static ssize_t blocksize_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
struct obd_statfs osfs;
int rc;
@@ -96,7 +117,7 @@ static ssize_t kbytestotal_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
struct obd_statfs osfs;
int rc;
@@ -121,7 +142,7 @@ static ssize_t kbytesfree_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
struct obd_statfs osfs;
int rc;
@@ -146,7 +167,7 @@ static ssize_t kbytesavail_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
struct obd_statfs osfs;
int rc;
@@ -171,7 +192,7 @@ static ssize_t filestotal_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
struct obd_statfs osfs;
int rc;
@@ -189,7 +210,7 @@ static ssize_t filesfree_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
struct obd_statfs osfs;
int rc;
@@ -214,7 +235,7 @@ static ssize_t fstype_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
return sprintf(buf, "%s\n", sbi->ll_mnt.mnt->mnt_sb->s_type->name);
}
@@ -224,7 +245,7 @@ static ssize_t uuid_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
return sprintf(buf, "%s\n", sbi->ll_sb_uuid.uuid);
}
@@ -247,7 +268,7 @@ static ssize_t max_read_ahead_mb_show(struct kobject *kobj,
struct attribute *attr, char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
long pages_number;
int mult;
@@ -265,7 +286,7 @@ static ssize_t max_read_ahead_mb_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long pages_number;
@@ -294,7 +315,7 @@ static ssize_t max_read_ahead_per_file_mb_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
long pages_number;
int mult;
@@ -312,7 +333,7 @@ static ssize_t max_read_ahead_per_file_mb_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long pages_number;
@@ -339,7 +360,7 @@ static ssize_t max_read_ahead_whole_mb_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
long pages_number;
int mult;
@@ -357,7 +378,7 @@ static ssize_t max_read_ahead_whole_mb_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long pages_number;
@@ -522,7 +543,7 @@ static ssize_t checksum_pages_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
return sprintf(buf, "%u\n", (sbi->ll_flags & LL_SBI_CHECKSUM) ? 1 : 0);
}
@@ -533,7 +554,7 @@ static ssize_t checksum_pages_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long val;
@@ -564,7 +585,7 @@ static ssize_t ll_rd_track_id(struct kobject *kobj, char *buf,
enum stats_track_type type)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
if (sbi->ll_stats_track_type == type)
return sprintf(buf, "%d\n", sbi->ll_stats_track_id);
@@ -579,7 +600,7 @@ static ssize_t ll_wr_track_id(struct kobject *kobj, const char *buffer,
enum stats_track_type type)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long pid;
@@ -648,7 +669,7 @@ static ssize_t statahead_max_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
return sprintf(buf, "%u\n", sbi->ll_sa_max);
}
@@ -659,7 +680,7 @@ static ssize_t statahead_max_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long val;
@@ -682,7 +703,7 @@ static ssize_t statahead_agl_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
return sprintf(buf, "%u\n", sbi->ll_flags & LL_SBI_AGL_ENABLED ? 1 : 0);
}
@@ -693,7 +714,7 @@ static ssize_t statahead_agl_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long val;
@@ -734,7 +755,7 @@ static ssize_t lazystatfs_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
return sprintf(buf, "%u\n", sbi->ll_flags & LL_SBI_LAZYSTATFS ? 1 : 0);
}
@@ -745,7 +766,7 @@ static ssize_t lazystatfs_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long val;
@@ -769,7 +790,7 @@ static ssize_t max_easize_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
unsigned int ealen;
int rc;
@@ -798,7 +819,7 @@ static ssize_t default_easize_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
unsigned int ealen;
int rc;
@@ -831,7 +852,7 @@ static ssize_t default_easize_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
unsigned long val;
int rc;
@@ -877,7 +898,7 @@ static ssize_t xattr_cache_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
return sprintf(buf, "%u\n", sbi->ll_xattr_cache_enabled);
}
@@ -888,7 +909,7 @@ static ssize_t xattr_cache_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
int rc;
unsigned long val;
@@ -913,7 +934,7 @@ static ssize_t fast_read_show(struct kobject *kobj,
char *buf)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
return sprintf(buf, "%u\n", !!(sbi->ll_flags & LL_SBI_FAST_READ));
}
@@ -924,7 +945,7 @@ static ssize_t fast_read_store(struct kobject *kobj,
size_t count)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
bool val;
int rc;
@@ -1110,7 +1131,7 @@ static ssize_t ll_nosquash_nids_seq_write(struct file *file,
static void llite_sb_release(struct kobject *kobj)
{
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
- ll_kobj);
+ ll_kset.kobj);
complete(&sbi->ll_kobj_unregister);
}
@@ -1285,17 +1306,22 @@ int ll_debugfs_register_super(struct super_block *sb, char *osc, char *mdc)
ldebugfs_add_vars(sbi->ll_debugfs_entry, lprocfs_llite_obd_vars, sb);
- sbi->ll_kobj.kset = llite_kset;
+ /* Yes we also register sysfs mount kset here as well */
+ sbi->ll_kset.kobj.parent = llite_kobj;
+ sbi->ll_kset.kobj.ktype = &llite_ktype;
init_completion(&sbi->ll_kobj_unregister);
- err = kobject_init_and_add(&sbi->ll_kobj, &llite_ktype, NULL,
- "%s", name);
+ err = kobject_set_name(&sbi->ll_kset.kobj, "%s", name);
+ if (err)
+ goto out;
+
+ err = kset_register(&sbi->ll_kset);
if (err)
goto out;
/* MDC info */
obd = class_name2obd(mdc);
- err = sysfs_create_link(&sbi->ll_kobj, &obd->obd_kobj,
+ err = sysfs_create_link(&sbi->ll_kset.kobj, &obd->obd_kobj,
obd->obd_type->typ_name);
if (err)
goto out;
@@ -1303,7 +1329,7 @@ int ll_debugfs_register_super(struct super_block *sb, char *osc, char *mdc)
/* OSC */
obd = class_name2obd(osc);
- err = sysfs_create_link(&sbi->ll_kobj, &obd->obd_kobj,
+ err = sysfs_create_link(&sbi->ll_kset.kobj, &obd->obd_kobj,
obd->obd_type->typ_name);
out:
if (err) {
@@ -1317,8 +1343,10 @@ int ll_debugfs_register_super(struct super_block *sb, char *osc, char *mdc)
void ll_debugfs_unregister_super(struct ll_sb_info *sbi)
{
debugfs_remove_recursive(sbi->ll_debugfs_entry);
- kobject_put(&sbi->ll_kobj);
+
+ kset_unregister(&sbi->ll_kset);
wait_for_completion(&sbi->ll_kobj_unregister);
+
lprocfs_free_stats(&sbi->ll_ra_stats);
lprocfs_free_stats(&sbi->ll_stats);
}
--
1.8.3.1
More information about the lustre-devel
mailing list