NSM: Move NSM-related XDR data structures to lockd's xdr.h

Clean up: NSM's XDR data structures are used only in fs/lockd/mon.c,
so move them there.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 3bb71e1..8130883 100644 (file)
--- a/fs/lockd/mon.c
+++ b/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/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h
index 896a5e3..dd9d8a5 100644 (file)
--- a/include/linux/lockd/sm_inter.h
+++ b/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 */