FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-23 05:52:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lockd: Remove src_sap and src_len from nlm_lookup_host_info struct

Browse Source 
Clean up.

The contents of the src_sap field is not used in nlm_alloc_host().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2010-12-14 15:06:52 +00:00 committed by Trond Myklebust
parent 2025889828
commit 7969183660
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/lockd/host.c
View File

@ -53,8 +53,6 @@ struct nlm_lookup_host_info {
const u32 version; /* NLM version to search for */ const u32 version; /* NLM version to search for */
const char *hostname; /* remote's hostname */ const char *hostname; /* remote's hostname */
const size_t hostname_len; /* it's length */ const size_t hostname_len; /* it's length */
const struct sockaddr *src_sap; /* our address (optional) */
const size_t src_len; /* it's length */
const int noresvport; /* use non-priv port */ const int noresvport; /* use non-priv port */
}; };
@ -324,6 +322,8 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
struct sockaddr_in6 sin6 = { struct sockaddr_in6 sin6 = {
.sin6_family = AF_INET6, .sin6_family = AF_INET6,
}; };
struct sockaddr *src_sap;
size_t src_len = rqstp->rq_addrlen;
struct nlm_lookup_host_info ni = { struct nlm_lookup_host_info ni = {
.server = 1, .server = 1,
.sap = svc_addr(rqstp), .sap = svc_addr(rqstp),
@ -332,7 +332,6 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
.version = rqstp->rq_vers, .version = rqstp->rq_vers,
.hostname = hostname, .hostname = hostname,
.hostname_len = hostname_len, .hostname_len = hostname_len,
.src_len = rqstp->rq_addrlen,
}; };
dprintk("lockd: %s(host='%*s', vers=%u, proto=%s)\n", __func__, dprintk("lockd: %s(host='%*s', vers=%u, proto=%s)\n", __func__,
@ -344,11 +343,11 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
switch (ni.sap->sa_family) { switch (ni.sap->sa_family) {
case AF_INET: case AF_INET:
sin.sin_addr.s_addr = rqstp->rq_daddr.addr.s_addr; sin.sin_addr.s_addr = rqstp->rq_daddr.addr.s_addr;
ni.src_sap = (struct sockaddr *)&sin; src_sap = (struct sockaddr *)&sin;
break; break;
case AF_INET6: case AF_INET6:
ipv6_addr_copy(&sin6.sin6_addr, &rqstp->rq_daddr.addr6); ipv6_addr_copy(&sin6.sin6_addr, &rqstp->rq_daddr.addr6);
ni.src_sap = (struct sockaddr *)&sin6; src_sap = (struct sockaddr *)&sin6;
break; break;
default: default:
dprintk("lockd: %s failed; unrecognized address family\n", dprintk("lockd: %s failed; unrecognized address family\n",
@ -372,7 +371,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
continue; continue;
if (host->h_version != ni.version) if (host->h_version != ni.version)
continue; continue;
if (!rpc_cmp_addr(nlm_srcaddr(host), ni.src_sap)) if (!rpc_cmp_addr(nlm_srcaddr(host), src_sap))
continue; continue;
/* Move to head of hash chain. */ /* Move to head of hash chain. */
@ -389,8 +388,8 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
if (unlikely(host == NULL)) if (unlikely(host == NULL))
goto out; goto out;
memcpy(nlm_srcaddr(host), ni.src_sap, ni.src_len); memcpy(nlm_srcaddr(host), src_sap, src_len);
host->h_srcaddrlen = ni.src_len; host->h_srcaddrlen = src_len;
hlist_add_head(&host->h_hash, chain); hlist_add_head(&host->h_hash, chain);
nrhosts++; nrhosts++;