NLM: LOCKD fails to load if CONFIG_SYSCTL is not set (90d5b180) · Commits · 戴 / test

Bruce Fields says: "By the way, we've got another config-related nit here: http://bugzilla.linux-nfs.org/show_bug.cgi?id=156 You can build lockd without CONFIG_SYSCTL set, but then the module will fail to load." For now, disable the sysctl registration calls in lockd if CONFIG_SYSCTL is not enabled. This allows the kernel to build properly if PROC_FS or SYSCTL is not enabled, but an NFS client is desired. In the long run, we would like to be able to build the kernel with an NFS client but without lockd. This makes sense, for example, if you want an NFSv4-only NFS client, as NFSv4 doesn't use NLM at all. Signed-off-by:

Chuck Lever <chuck.lever@oracle.com> Signed-off-by:

Trond Myklebust <Trond.Myklebust@netapp.com>

fs/lockd/svc.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -74,7 +74,9 @@ static const unsigned long nlm_timeout_min = 3;
		static const unsigned long nlm_timeout_max = 20;
		static const int nlm_port_min = 0, nlm_port_max = 65535;

		#ifdef CONFIG_SYSCTL
		static struct ctl_table_header * nlm_sysctl_table;
		#endif

		static unsigned long get_lockd_grace_period(void)
		{
		@@ -359,6 +361,8 @@ out:
		}
		EXPORT_SYMBOL(lockd_down);

		#ifdef CONFIG_SYSCTL

		/*
		* Sysctl parameters (same as module parameters, different interface).
		*/
		@@ -443,6 +447,8 @@ static ctl_table nlm_sysctl_root[] = {
		{ .ctl_name = 0 }
		};

		#endif /* CONFIG_SYSCTL */

		/*
		* Module (and sysfs) parameters.
		*/
		@@ -516,15 +522,21 @@ module_param(nsm_use_hostnames, bool, 0644);

		static int __init init_nlm(void)
		{
		#ifdef CONFIG_SYSCTL
		nlm_sysctl_table = register_sysctl_table(nlm_sysctl_root);
		return nlm_sysctl_table ? 0 : -ENOMEM;
		#else
		return 0;
		#endif
		}

		static void __exit exit_nlm(void)
		{
		/* FIXME: delete all NLM clients */
		nlm_shutdown_hosts();
		#ifdef CONFIG_SYSCTL
		unregister_sysctl_table(nlm_sysctl_table);
		#endif
		}

		module_init(init_nlm);

Admin message