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

Move client_type 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 3dce0bacac2ab0067470e791b89979eccbb4e6c1..fba21f877f1988b844e4c2cab6dfe4c373c846cc 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c
+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c
@@ -177,20 +177,16 @@ static ssize_t filesfree_show(struct kobject *kobj, struct attribute *attr,
 }
 LUSTRE_RO_ATTR(filesfree);
 
-static int ll_client_type_seq_show(struct seq_file *m, void *v)
+static ssize_t client_type_show(struct kobject *kobj, struct attribute *attr,
+                               char *buf)
 {
-       struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private);
-
-       LASSERT(sbi != NULL);
-
-       if (sbi->ll_flags & LL_SBI_RMT_CLIENT)
-               seq_puts(m, "remote client\n");
-       else
-               seq_puts(m, "local client\n");
+       struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
+                                             ll_kobj);
 
-       return 0;
+       return sprintf(buf, "%s client\n",
+                       sbi->ll_flags & LL_SBI_RMT_CLIENT ? "remote" : "local");
 }
-LPROC_SEQ_FOPS_RO(ll_client_type);
+LUSTRE_RO_ATTR(client_type);
 
 static int ll_fstype_seq_show(struct seq_file *m, void *v)
 {
@@ -845,7 +841,6 @@ static struct lprocfs_vars lprocfs_llite_obd_vars[] = {
        /* { "mntpt_path",   ll_rd_path,             0, 0 }, */
        { "fstype",       &ll_fstype_fops,        NULL, 0 },
        { "site",         &ll_site_stats_fops,    NULL, 0 },
-       { "client_type",  &ll_client_type_fops,   NULL, 0 },
        /* { "filegroups",   lprocfs_rd_filegroups,  0, 0 }, */
        { "max_read_ahead_mb", &ll_max_readahead_mb_fops, NULL },
        { "max_read_ahead_per_file_mb", &ll_max_readahead_per_file_mb_fops,
@@ -879,6 +874,7 @@ static struct attribute *llite_attrs[] = {
        &lustre_attr_kbytesavail.attr,
        &lustre_attr_filestotal.attr,
        &lustre_attr_filesfree.attr,
+       &lustre_attr_client_type.attr,
        NULL,
 };
 

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