Make statd support switchable

Index: build/fs/lockd/host.c
===================================================================
@@ -32,6 +32,13 @@ static unsigned long		next_gc;
 static int			nrhosts;
 static DEFINE_MUTEX(nlm_host_mutex);
 
+/*
+ * Function pointers - will reference either the
+ * "standard" statd functions that do upcalls to user land,
+ * or the kernel statd functions.
+ */
+int				(*nsm_monitor)(struct nlm_host *);
+int				(*nsm_unmonitor)(struct nlm_host *);
 
 static void			nlm_gc_hosts(void);
 static struct nsm_handle *	__nsm_find(const struct sockaddr_in *,

Index: build/fs/lockd/mon.c
===================================================================
@@ -18,6 +18,8 @@
 #define NLMDBG_FACILITY		NLMDBG_MONITOR
 
 static struct rpc_clnt *	nsm_create(void);
+static int			__nsm_monitor(struct nlm_host *);
+static int			__nsm_unmonitor(struct nlm_host *);
 
 static struct rpc_program	nsm_program;
 

@@ -27,6 +29,17 @@ static struct rpc_program	nsm_program;
 int				nsm_local_state;
 
 /*
+ * Initialize lockd for RPC statd upcalls
+ */
+void
+nsm_statd_upcalls_init()
+{
+	nsm_monitor = __nsm_monitor;
+	nsm_unmonitor = __nsm_unmonitor;
+}
+
+
+/*
  * Common procedure for SM_MON/SM_UNMON calls
  */
 static int

@@ -69,7 +82,7 @@ nsm_mon_unmon(struct nsm_handle *nsm, u3
  * Set up monitoring of a remote host
  */
 int
-nsm_monitor(struct nlm_host *host)
+__nsm_monitor(struct nlm_host *host)
 {
 	struct nsm_handle *nsm = host->h_nsmhandle;
 	struct nsm_res	res;

@@ -94,7 +107,7 @@ nsm_monitor(struct nlm_host *host)
  * Cease to monitor remote host
  */
 int
-nsm_unmonitor(struct nlm_host *host)
+__nsm_unmonitor(struct nlm_host *host)
 {
 	struct nsm_handle *nsm = host->h_nsmhandle;
 	struct nsm_res	res;

Index: build/fs/lockd/svc.c
===================================================================
@@ -119,6 +119,9 @@ lockd(struct svc_rqst *rqstp)
 
 	daemonize("lockd");
 
+	/* Initialize the statd upcalls to rpc.statd */
+	nsm_statd_upcalls_init();
+
 	/* Process request with signals blocked, but allow SIGKILL.  */
 	allow_signal(SIGKILL);
 

@@ -472,6 +475,9 @@ static int __init init_nlm(void)
 {
 	struct ctl_path ctl_path[] = { { CTL_FS, "fs", 0555 }, { -2, "nfs", 0555 }, { 0 } };
 
+	/* Default NSM to making upcalls to statd. */
+	nsm_statd_upcalls_init();
+
 	nlm_sysctl_table = register_sysctl_table_path(nlm_sysctls, ctl_path);
 	return 0;
 }

Index: build/include/linux/lockd/sm_inter.h
===================================================================
@@ -40,8 +40,9 @@ struct nsm_res {
 	u32		state;
 };
 
-int		nsm_monitor(struct nlm_host *);
-int		nsm_unmonitor(struct nlm_host *);
+extern void	nsm_statd_upcalls_init(void);
+extern int	(*nsm_monitor)(struct nlm_host *);
+extern int	(*nsm_unmonitor)(struct nlm_host *);
 extern int	nsm_local_state;
 
 #endif /* LINUX_LOCKD_SM_INTER_H */