From 88abcccf8c32543fcfb11fe23ede92a1e9e76399 Mon Sep 17 00:00:00 2001
From: Olaf Kirch <okir@suse.de>
Date: Wed, 4 Oct 2006 02:16:03 -0700
Subject: [PATCH] --- yaml --- r: 38386 b: refs/heads/master c:
 460f5cac1e24e947509b6112c99c5bc9ff687b45 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/fs/lockd/mon.c                 | 2 +-
 trunk/fs/lockd/svc.c                 | 9 +++++++++
 trunk/include/linux/lockd/sm_inter.h | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f868d985c05c..f079e82e03b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39be4502cb75dc26007fe1659735b26c8e63fcc6
+refs/heads/master: 460f5cac1e24e947509b6112c99c5bc9ff687b45
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index 709cf7c80545..e0179f8c327f 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/fs/lockd/mon.c
@@ -24,7 +24,7 @@ static struct rpc_program	nsm_program;
 /*
  * Local NSM state
  */
-u32				nsm_local_state;
+int				nsm_local_state;
 
 /*
  * Common procedure for SM_MON/SM_UNMON calls
diff --git a/trunk/fs/lockd/svc.c b/trunk/fs/lockd/svc.c
index a3b7602cd383..634139232aaf 100644
--- a/trunk/fs/lockd/svc.c
+++ b/trunk/fs/lockd/svc.c
@@ -33,6 +33,7 @@
 #include <linux/sunrpc/svcsock.h>
 #include <net/ip.h>
 #include <linux/lockd/lockd.h>
+#include <linux/lockd/sm_inter.h>
 #include <linux/nfs.h>
 
 #define NLMDBG_FACILITY		NLMDBG_SVC
@@ -404,6 +405,14 @@ static ctl_table nlm_sysctls[] = {
 		.mode		= 0644,
 		.proc_handler	= &proc_dointvec,
 	},
+	{
+		.ctl_name	= CTL_UNNUMBERED,
+		.procname	= "nsm_local_state",
+		.data		= &nsm_local_state,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
+	},
 	{ .ctl_name = 0 }
 };
 
diff --git a/trunk/include/linux/lockd/sm_inter.h b/trunk/include/linux/lockd/sm_inter.h
index daef509bb9b3..fc61d40964da 100644
--- a/trunk/include/linux/lockd/sm_inter.h
+++ b/trunk/include/linux/lockd/sm_inter.h
@@ -42,6 +42,6 @@ struct nsm_res {
 
 int		nsm_monitor(struct nlm_host *);
 int		nsm_unmonitor(struct nlm_host *);
-extern u32	nsm_local_state;
+extern int	nsm_local_state;
 
 #endif /* LINUX_LOCKD_SM_INTER_H */