Commit f6eb5349 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Remove args subdir from gfs2 sysfs files 



Since we can cat /proc/mounts there is no need to have this
subdirectory in the gfs2 sysfs files. In fact this does not
reflect the full range of possible mount argumenmts, where
as /proc/mounts does.

There was only one userland user of this set of sysfs files
and it will function perfectly well without these files
being present (in fact that subcommand of gfs2_tool is
obsolete anyway).

The tune/* subdirectory is also considered mostly obsolete,
but there are a few uses of this until mount arguments can
be added for the last few functions for which there are no
equivalents currently. However the tune/* directory is still
in my sights and new code should avoid using it. Only the gfs2_quota
and gfs2_tool programs are know to use tune/* at the moment.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent e1b28aab

fs/gfs2/sys.c

+1 −51
Original line number Diff line number Diff line
@@ -411,44 +411,6 @@ static struct attribute *lock_module_attrs[] = { 
	NULL,

};



#define ARGS_ATTR(name, fmt)                                                \

static ssize_t name##_show(struct gfs2_sbd *sdp, char *buf)                 \

{                                                                           \

	return snprintf(buf, PAGE_SIZE, fmt, sdp->sd_args.ar_##name);       \

}                                                                           \

static struct gfs2_attr args_attr_##name = __ATTR_RO(name)



ARGS_ATTR(lockproto,       "%s\n");

ARGS_ATTR(locktable,       "%s\n");

ARGS_ATTR(hostdata,        "%s\n");

ARGS_ATTR(spectator,       "%d\n");

ARGS_ATTR(ignore_local_fs, "%d\n");

ARGS_ATTR(localcaching,    "%d\n");

ARGS_ATTR(localflocks,     "%d\n");

ARGS_ATTR(debug,           "%d\n");

ARGS_ATTR(upgrade,         "%d\n");

ARGS_ATTR(posix_acl,       "%d\n");

ARGS_ATTR(quota,           "%u\n");

ARGS_ATTR(suiddir,         "%d\n");

ARGS_ATTR(data,            "%d\n");



static struct attribute *args_attrs[] = {

	&args_attr_lockproto.attr,

	&args_attr_locktable.attr,

	&args_attr_hostdata.attr,

	&args_attr_spectator.attr,

	&args_attr_ignore_local_fs.attr,

	&args_attr_localcaching.attr,

	&args_attr_localflocks.attr,

	&args_attr_debug.attr,

	&args_attr_upgrade.attr,

	&args_attr_posix_acl.attr,

	&args_attr_quota.attr,

	&args_attr_suiddir.attr,

	&args_attr_data.attr,

	NULL,

};



/*

 * get and set struct gfs2_tune fields

 */
@@ -545,11 +507,6 @@ static struct attribute *tune_attrs[] = { 
	NULL,

};



static struct attribute_group args_group = {

	.name = "args",

	.attrs = args_attrs,

};



static struct attribute_group tune_group = {

	.name = "tune",

	.attrs = tune_attrs,
@@ -570,13 +527,9 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp) 
	if (error)

		goto fail;



	error = sysfs_create_group(&sdp->sd_kobj, &args_group);

	if (error)

		goto fail_reg;



	error = sysfs_create_group(&sdp->sd_kobj, &tune_group);

	if (error)

		goto fail_args;

		goto fail_reg;



	error = sysfs_create_group(&sdp->sd_kobj, &lock_module_group);

	if (error)
@@ -587,8 +540,6 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp) 


fail_tune:

	sysfs_remove_group(&sdp->sd_kobj, &tune_group);

fail_args:

	sysfs_remove_group(&sdp->sd_kobj, &args_group);

fail_reg:

	kobject_put(&sdp->sd_kobj);

fail:
@@ -599,7 +550,6 @@ fail: 
void gfs2_sys_fs_del(struct gfs2_sbd *sdp)

{

	sysfs_remove_group(&sdp->sd_kobj, &tune_group);

	sysfs_remove_group(&sdp->sd_kobj, &args_group);

	sysfs_remove_group(&sdp->sd_kobj, &lock_module_group);

	kobject_put(&sdp->sd_kobj);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE