staging/lustre/llite: move /proc/fs/lustre/llite/fstype to sysfs

Move fstype file from /proc/fs/lustre/llite/*
to /sys/fs/lustre/llite/*/

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c
index fba21f877f1988b844e4c2cab6dfe4c373c846cc..53671db2b6d357514be88a7f81c14e1640de9021 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c
+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c
@@ -188,15 +188,15 @@ static ssize_t client_type_show(struct kobject *kobj, struct attribute *attr,
 }
 LUSTRE_RO_ATTR(client_type);
 
-static int ll_fstype_seq_show(struct seq_file *m, void *v)
+static ssize_t fstype_show(struct kobject *kobj, struct attribute *attr,
+                          char *buf)
 {
-       struct super_block *sb = (struct super_block *)m->private;
+       struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
+                                             ll_kobj);
 
-       LASSERT(sb != NULL);
-       seq_printf(m, "%s\n", sb->s_type->name);
-       return 0;
+       return sprintf(buf, "%s\n", sbi->ll_sb->s_type->name);
 }
-LPROC_SEQ_FOPS_RO(ll_fstype);
+LUSTRE_RO_ATTR(fstype);
 
 static int ll_sb_uuid_seq_show(struct seq_file *m, void *v)
 {
@@ -839,7 +839,6 @@ LPROC_SEQ_FOPS(ll_xattr_cache);
 static struct lprocfs_vars lprocfs_llite_obd_vars[] = {
        { "uuid",         &ll_sb_uuid_fops,       NULL, 0 },
        /* { "mntpt_path",   ll_rd_path,             0, 0 }, */
-       { "fstype",       &ll_fstype_fops,        NULL, 0 },
        { "site",         &ll_site_stats_fops,    NULL, 0 },
        /* { "filegroups",   lprocfs_rd_filegroups,  0, 0 }, */
        { "max_read_ahead_mb", &ll_max_readahead_mb_fops, NULL },
@@ -875,6 +874,7 @@ static struct attribute *llite_attrs[] = {
        &lustre_attr_filestotal.attr,
        &lustre_attr_filesfree.attr,
        &lustre_attr_client_type.attr,
+       &lustre_attr_fstype.attr,
        NULL,
 };
 

diff --git a/drivers/staging/lustre/sysfs-fs-lustre b/drivers/staging/lustre/sysfs-fs-lustre
index 213eb8681461ad119a077917b0753129fda551c7..36c20d893a520b4a0f75f0b8adcfd56248454081 100644 (file)
--- a/drivers/staging/lustre/sysfs-fs-lustre
+++ b/drivers/staging/lustre/sysfs-fs-lustre
@@ -85,3 +85,9 @@ Description:
                Shows whenever this filesystem considers this client to be
                compute cluster-local or remote. Remote clients have
                additional uid/gid convrting logic applied.
+
+What:          /sys/fs/lustre/llite/<fsname>-<uuid>/fstype
+Date:          May 2015
+Contact:       "Oleg Drokin" <oleg.drokin@intel.com>
+Description:
+               Shows filesystem type of the filesystem