Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec55a629 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0cee6676

drivers/staging/lustre/lustre/llite/lproc_llite.c

+7 −7
Original line number Diff line number Diff line
@@ -198,15 +198,15 @@ static ssize_t fstype_show(struct kobject *kobj, struct attribute *attr, 
}

LUSTRE_RO_ATTR(fstype);



static int ll_sb_uuid_seq_show(struct seq_file *m, void *v)

static ssize_t uuid_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", ll_s2sbi(sb)->ll_sb_uuid.uuid);

	return 0;

	return sprintf(buf, "%s\n", sbi->ll_sb_uuid.uuid);

}

LPROC_SEQ_FOPS_RO(ll_sb_uuid);

LUSTRE_RO_ATTR(uuid);



static int ll_site_stats_seq_show(struct seq_file *m, void *v)

{
@@ -837,7 +837,6 @@ static ssize_t ll_xattr_cache_seq_write(struct file *file, 
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 }, */

	{ "site",	  &ll_site_stats_fops,    NULL, 0 },

	/* { "filegroups",   lprocfs_rd_filegroups,  0, 0 }, */
@@ -875,6 +874,7 @@ static struct attribute *llite_attrs[] = { 
	&lustre_attr_filesfree.attr,

	&lustre_attr_client_type.attr,

	&lustre_attr_fstype.attr,

	&lustre_attr_uuid.attr,

	NULL,

};

drivers/staging/lustre/sysfs-fs-lustre

+6 −0
Original line number Diff line number Diff line
@@ -91,3 +91,9 @@ Date: May 2015 
Contact:	"Oleg Drokin" <oleg.drokin@intel.com>

Description:

		Shows filesystem type of the filesystem



What:		/sys/fs/lustre/llite/<fsname>-<uuid>/uuid

Date:		May 2015

Contact:	"Oleg Drokin" <oleg.drokin@intel.com>

Description:

		Shows this filesystem superblock uuid