diff options
-rw-r--r-- | fs/lockd/mon.c | 5 | ||||
-rw-r--r-- | include/linux/lockd/lockd.h | 10 |
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 | */ |
56 | int nsm_local_state; | 56 | int nsm_local_state; |
57 | 57 | ||
58 | static inline struct sockaddr *nsm_addr(const struct nsm_handle *nsm) | ||
59 | { | ||
60 | return (struct sockaddr *)&nsm->sm_addr; | ||
61 | } | ||
62 | |||
58 | static void nsm_display_ipv4_address(const struct sockaddr *sap, char *buf, | 63 | static 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 | ||
115 | static inline struct sockaddr_in *nsm_addr_in(const struct nsm_handle *handle) | ||
116 | { | ||
117 | return (struct sockaddr_in *)&handle->sm_addr; | ||
118 | } | ||
119 | |||
120 | static 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 | */ |