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>
This commit is contained in:
Родитель
ec6ee61250
Коммит
b97a56747e
|
@ -87,18 +87,6 @@ static unsigned int nlm_hash_address(const struct sockaddr *sap)
|
||||||
return hash & (NLM_HOST_NRHASH - 1);
|
return hash & (NLM_HOST_NRHASH - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void nlm_clear_port(struct sockaddr *sap)
|
|
||||||
{
|
|
||||||
switch (sap->sa_family) {
|
|
||||||
case AF_INET:
|
|
||||||
((struct sockaddr_in *)sap)->sin_port = 0;
|
|
||||||
break;
|
|
||||||
case AF_INET6:
|
|
||||||
((struct sockaddr_in6 *)sap)->sin6_port = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Common host lookup routine for server & client
|
* Common host lookup routine for server & client
|
||||||
*/
|
*/
|
||||||
|
@ -177,7 +165,7 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni)
|
||||||
host->h_addrbuf = nsm->sm_addrbuf;
|
host->h_addrbuf = nsm->sm_addrbuf;
|
||||||
memcpy(nlm_addr(host), ni->sap, ni->salen);
|
memcpy(nlm_addr(host), ni->sap, ni->salen);
|
||||||
host->h_addrlen = ni->salen;
|
host->h_addrlen = ni->salen;
|
||||||
nlm_clear_port(nlm_addr(host));
|
rpc_set_port(nlm_addr(host), 0);
|
||||||
memcpy(nlm_srcaddr(host), ni->src_sap, ni->src_len);
|
memcpy(nlm_srcaddr(host), ni->src_sap, ni->src_len);
|
||||||
host->h_version = ni->version;
|
host->h_version = ni->version;
|
||||||
host->h_proto = ni->protocol;
|
host->h_proto = ni->protocol;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче