Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b97a5674 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

lockd: Replace nlm_clear_port() 



Clean up: Use shared rpc_set_port() function instead of nlm_clear_port().

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ec6ee612

fs/lockd/host.c

+1 −13
Original line number Diff line number Diff line
@@ -87,18 +87,6 @@ static unsigned int nlm_hash_address(const struct sockaddr *sap) 
	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

 */
@@ -177,7 +165,7 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni) 
	host->h_addrbuf    = nsm->sm_addrbuf;

	memcpy(nlm_addr(host), ni->sap, 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);

	host->h_version    = ni->version;

	host->h_proto      = ni->protocol;