diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2009-08-09 15:09:38 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-09 15:09:38 -0400 |
commit | b97a56747ea3f6c1a27dd0719bf1424959f1ebae (patch) | |
tree | 39d36fa3b82e37730fe8402f6a16cb582d7f6232 | |
parent | ec6ee61250acfccbc5578dd4014735fb2cbe53b5 (diff) |
lockd: Replace nlm_clear_port()
Clean up: Use shared rpc_set_port() function instead of nlm_clear_port().
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | fs/lockd/host.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 99d737bd4325..7cb076ac6b45 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c | |||
@@ -87,18 +87,6 @@ static unsigned int nlm_hash_address(const struct sockaddr *sap) | |||
87 | return hash & (NLM_HOST_NRHASH - 1); | 87 | return hash & (NLM_HOST_NRHASH - 1); |
88 | } | 88 | } |
89 | 89 | ||
90 | static void nlm_clear_port(struct sockaddr *sap) | ||
91 | { | ||
92 | switch (sap->sa_family) { | ||
93 | case AF_INET: | ||
94 | ((struct sockaddr_in *)sap)->sin_port = 0; | ||
95 | break; | ||
96 | case AF_INET6: | ||
97 | ((struct sockaddr_in6 *)sap)->sin6_port = 0; | ||
98 | break; | ||
99 | } | ||
100 | } | ||
101 | |||
102 | /* | 90 | /* |
103 | * Common host lookup routine for server & client | 91 | * Common host lookup routine for server & client |
104 | */ | 92 | */ |
@@ -177,7 +165,7 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni) | |||
177 | host->h_addrbuf = nsm->sm_addrbuf; | 165 | host->h_addrbuf = nsm->sm_addrbuf; |
178 | memcpy(nlm_addr(host), ni->sap, ni->salen); | 166 | memcpy(nlm_addr(host), ni->sap, ni->salen); |
179 | host->h_addrlen = ni->salen; | 167 | host->h_addrlen = ni->salen; |
180 | nlm_clear_port(nlm_addr(host)); | 168 | rpc_set_port(nlm_addr(host), 0); |
181 | memcpy(nlm_srcaddr(host), ni->src_sap, ni->src_len); | 169 | memcpy(nlm_srcaddr(host), ni->src_sap, ni->src_len); |
182 | host->h_version = ni->version; | 170 | host->h_version = ni->version; |
183 | host->h_proto = ni->protocol; | 171 | host->h_proto = ni->protocol; |