summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-12-05 19:01:59 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 11:53:52 -0500
commit9c1bfd037f7ff8badaecb47418f109148d88bf45 (patch)
tree23435f76798f026e5cb1cdeb91077d854b359ac4
parent0c7aef4569f8680951b7dee01dddffb9d2f809ff (diff)
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>
-rw-r--r--fs/lockd/mon.c14
-rw-r--r--include/linux/lockd/sm_inter.h20
2 files changed, 14 insertions, 20 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 3bb71e1b1e1..81308832e99 100644
--- 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 896a5e30332..dd9d8a5bb31 100644
--- 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 */