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

staging/lustre: Get rid of remaining /proc/sys/lustre plumbing 



Since all of the variables from /proc/sys/lustre were moved to
/sys/fs/lustre, get rid of the remaining infrastructure.

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

drivers/staging/lustre/lustre/include/obd_class.h

+0 −1
Original line number Diff line number Diff line
@@ -1870,7 +1870,6 @@ extern int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c); 


/* sysctl.c */

extern int obd_sysctl_init(void);

extern void obd_sysctl_clean(void);



/* uuid.c  */

typedef __u8 class_uuid_t[16];

drivers/staging/lustre/lustre/obdclass/class_obd.c

+0 −1
Original line number Diff line number Diff line
@@ -659,7 +659,6 @@ static void cleanup_obdclass(void) 
	lu_global_fini();



	obd_cleanup_caches();

	obd_sysctl_clean();



	class_procfs_clean();

drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c

+0 −30
Original line number Diff line number Diff line
@@ -50,10 +50,6 @@ 
#include "../../include/obd_support.h"

#include "../../include/lprocfs_status.h"



#ifdef CONFIG_SYSCTL

static struct ctl_table_header *obd_table_header;

#endif



struct static_lustre_uintvalue_attr {

	struct {

		struct attribute attr;
@@ -144,23 +140,6 @@ LUSTRE_STATIC_UINT_ATTR(at_extra, &at_extra); 
LUSTRE_STATIC_UINT_ATTR(at_early_margin, &at_early_margin);

LUSTRE_STATIC_UINT_ATTR(at_history, &at_history);



#ifdef CONFIG_SYSCTL

static struct ctl_table obd_table[] = {

	{}

};



static struct ctl_table parent_table[] = {

	{

		.procname = "lustre",

		.data     = NULL,

		.maxlen   = 0,

		.mode     = 0555,

		.child    = obd_table

	},

	{}

};

#endif



static struct attribute *lustre_attrs[] = {

	&lustre_sattr_timeout.u.attr,

	&lustre_attr_max_dirty_mb.attr,
@@ -181,18 +160,9 @@ static struct attribute_group lustre_attr_group = { 


int obd_sysctl_init(void)

{

#ifdef CONFIG_SYSCTL

	if (!obd_table_header)

		obd_table_header = register_sysctl_table(parent_table);

#endif

	return sysfs_create_group(lustre_kobj, &lustre_attr_group);

}



void obd_sysctl_clean(void)

{

#ifdef CONFIG_SYSCTL

	if (obd_table_header)

		unregister_sysctl_table(obd_table_header);

	obd_table_header = NULL;

#endif

}