Clean up: NSM's XDR data structures are used only in fs/lockd/mon.c,
so move them out of the public header sm_inter.h.
Signed-off-by: Chuck Lever <[email protected]>
---
fs/lockd/mon.c | 14 ++++++++++++++
include/linux/lockd/sm_inter.h | 20 --------------------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index d48ae14..db650cf 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -22,6 +22,20 @@ static struct rpc_clnt * nsm_create(void);
static struct rpc_program nsm_program;
+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;
+};
+
/*
* Local NSM state
*/
diff --git a/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h
index f75d3ea..29f0206 100644
--- a/include/linux/lockd/sm_inter.h
+++ b/include/linux/lockd/sm_inter.h
@@ -21,24 +21,4 @@
#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;
-};
-
#endif /* LINUX_LOCKD_SM_INTER_H */