From 34cac07720b945ec168978c8768545ccb52d3320 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Sun, 9 Aug 2009 15:09:38 -0400
Subject: [PATCH] --- yaml --- r: 158546 b: refs/heads/master c:
 b97a56747ea3f6c1a27dd0719bf1424959f1ebae h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/lockd/host.c | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 9e9279cb32da..bc23464f8c73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec6ee61250acfccbc5578dd4014735fb2cbe53b5
+refs/heads/master: b97a56747ea3f6c1a27dd0719bf1424959f1ebae
diff --git a/trunk/fs/lockd/host.c b/trunk/fs/lockd/host.c
index 99d737bd4325..7cb076ac6b45 100644
--- a/trunk/fs/lockd/host.c
+++ b/trunk/fs/lockd/host.c
@@ -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;