Commit c1d889cf authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Anna Schumaker
Browse files

lockd: simplify two-level sysctl registration for nlm_sysctls 



There is no need to declare two tables to just create directories,
this can be easily be done with a prefix path with register_sysctl().

Simplify this registration.

Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 40882deb

fs/lockd/svc.c

+1 −19
Original line number Diff line number Diff line
@@ -510,24 +510,6 @@ static struct ctl_table nlm_sysctls[] = { 
	{ }

};



static struct ctl_table nlm_sysctl_dir[] = {

	{

		.procname	= "nfs",

		.mode		= 0555,

		.child		= nlm_sysctls,

	},

	{ }

};



static struct ctl_table nlm_sysctl_root[] = {

	{

		.procname	= "fs",

		.mode		= 0555,

		.child		= nlm_sysctl_dir,

	},

	{ }

};



#endif	/* CONFIG_SYSCTL */



/*
@@ -644,7 +626,7 @@ static int __init init_nlm(void) 


#ifdef CONFIG_SYSCTL

	err = -ENOMEM;

	nlm_sysctl_table = register_sysctl_table(nlm_sysctl_root);

	nlm_sysctl_table = register_sysctl("fs/nfs", nlm_sysctls);

	if (nlm_sysctl_table == NULL)

		goto err_sysctl;

#endif