aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-12-11 17:56:22 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 11:53:55 -0500
commit8529bc51d30b8f001734b29b21a51b579c260f5b (patch)
treeaf1fe6d5cb2d67259d1c977731f523f2337a59eb
parente6765b83977f07983c7a10e6bbb19d6c7bbfc3a4 (diff)
NSM: Move nsm_addr() to fs/lockd/mon.c
Clean up: nsm_addr_in() is no longer used, and nsm_addr() is used only in fs/lockd/mon.c, so move it 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.c5
-rw-r--r--include/linux/lockd/lockd.h10
2 files changed, 5 insertions, 10 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index dfa9d80efcba..43be31c4a2de 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -55,6 +55,11 @@ static DEFINE_SPINLOCK(nsm_lock);
55 */ 55 */
56int nsm_local_state; 56int nsm_local_state;
57 57
58static inline struct sockaddr *nsm_addr(const struct nsm_handle *nsm)
59{
60 return (struct sockaddr *)&nsm->sm_addr;
61}
62
58static void nsm_display_ipv4_address(const struct sockaddr *sap, char *buf, 63static void nsm_display_ipv4_address(const struct sockaddr *sap, char *buf,
59 const size_t len) 64 const size_t len)
60{ 65{
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 8b57467375cc..6ab0449bc828 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -112,16 +112,6 @@ static inline struct sockaddr *nlm_srcaddr(const struct nlm_host *host)
112 return (struct sockaddr *)&host->h_srcaddr; 112 return (struct sockaddr *)&host->h_srcaddr;
113} 113}
114 114
115static inline struct sockaddr_in *nsm_addr_in(const struct nsm_handle *handle)
116{
117 return (struct sockaddr_in *)&handle->sm_addr;
118}
119
120static inline struct sockaddr *nsm_addr(const struct nsm_handle *handle)
121{
122 return (struct sockaddr *)&handle->sm_addr;
123}
124
125/* 115/*
126 * Map an fl_owner_t into a unique 32-bit "pid" 116 * Map an fl_owner_t into a unique 32-bit "pid"
127 */ 117 */