From 793b22ec1888dcbc7c483b56f7d96012ffa1ce90 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 5 Dec 2008 19:01:59 -0500
Subject: [PATCH] --- yaml --- r: 127455 b: refs/heads/master c:
 9c1bfd037f7ff8badaecb47418f109148d88bf45 h: refs/heads/master i:   127453:
 14fe45f06e4b94136c353cb90a2505e27bd95340   127451:
 736330f2a0d4ebc12b4b47ca696916d76f292686   127447:
 88b4455af1a64684501b23d78a98d402ec872dfd   127439:
 2bd4ae51791b43f33a4ff212370d1ea2fe1b3ca8   127423:
 2c11b2a3e6f8c599f281fe245eab65f7352869a1 v: v3

---
 [refs]                               |  2 +-
 trunk/fs/lockd/mon.c                 | 14 ++++++++++++++
 trunk/include/linux/lockd/sm_inter.h | 20 --------------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 682e727ebeee..8d763fb6f792 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c7aef4569f8680951b7dee01dddffb9d2f809ff
+refs/heads/master: 9c1bfd037f7ff8badaecb47418f109148d88bf45
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index 3bb71e1b1e1f..81308832e994 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/fs/lockd/mon.c
@@ -18,6 +18,20 @@
 
 #define NLMDBG_FACILITY		NLMDBG_MONITOR
 
+struct nsm_args {
+	__be32			addr;		/* remote address */
+	u32			prog;		/* RPC callback info */
+	u32			vers;
+	u32			proc;
+
+	char			*mon_name;
+};
+
+struct nsm_res {
+	u32			status;
+	u32			state;
+};
+
 static struct rpc_clnt *	nsm_create(void);
 
 static struct rpc_program	nsm_program;
diff --git a/trunk/include/linux/lockd/sm_inter.h b/trunk/include/linux/lockd/sm_inter.h
index 896a5e303323..dd9d8a5bb316 100644
--- a/trunk/include/linux/lockd/sm_inter.h
+++ b/trunk/include/linux/lockd/sm_inter.h
@@ -21,26 +21,6 @@
 #define SM_MAXSTRLEN	1024
 #define SM_PRIV_SIZE	16
 
-/*
- * Arguments for all calls to statd
- */
-struct nsm_args {
-	__be32		addr;		/* remote address */
-	u32		prog;		/* RPC callback info */
-	u32		vers;
-	u32		proc;
-
-	char *		mon_name;
-};
-
-/*
- * Result returned by statd
- */
-struct nsm_res {
-	u32		status;
-	u32		state;
-};
-
 extern int	nsm_local_state;
 
 #endif /* LINUX_LOCKD_SM_INTER_H */