Add kernel module support for nfslockd and krpc. Use the module system

to detect (or load) kernel NLM support in rpc.lockd. Remove the '-k'
option to rpc.lockd and make kernel NLM the default. A user can still
force the use of the old user NLM by building a kernel without NFSLOCKD
and/or removing the nfslockd.ko module.

1 files changed, 20 insertions, 0 deletions

diff --git a/sys/nlm/nlm_prot_impl.c b/sys/nlm/nlm_prot_impl.c
index 106f4b5..528f8a0 100644
--- a/sys/nlm/nlm_prot_impl.c
+++ b/sys/nlm/nlm_prot_impl.c
@@ -1781,3 +1781,23 @@ nlm_user_lockd(void)
 
 	return (nlm_lockd);
 }
+
+/*
+ * Kernel module glue
+ */
+static int
+nfslockd_modevent(module_t mod, int type, void *data)
+{
+
+	return (0);
+}
+static moduledata_t nfslockd_mod = {
+	"nfslockd",
+	nfslockd_modevent,
+	NULL,
+};
+DECLARE_MODULE(nfslockd, nfslockd_mod, SI_SUB_VFS, SI_ORDER_ANY);
+
+/* So that loader and kldload(2) can find us, wherever we are.. */
+MODULE_DEPEND(nfslockd, krpc, 1, 1, 1);
+MODULE_VERSION(nfslockd, 1);