aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-01-14 15:11:46 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-30 02:06:09 -0500
commitb91e101fca70319f9ca839311bceff5f44dfc1ed (patch)
tree0438cbd52b64b7396e3ff852e0661b06b65bbb67
parent33e01dc7f578813cda074ceaeaf68b0f3ffcc393 (diff)
SUNRPC: rpcb_getport_sync() should use built-in hostname generator
rpc_create() can already fill in the hostname with a string representation of the server's IP address, so remove redundant logic in in rpcb_getport_sync() that does that. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--net/sunrpc/rpcb_clnt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index a6cd35883fa7..8962ac6b4c11 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -220,14 +220,12 @@ int rpcb_getport_sync(struct sockaddr_in *sin, __u32 prog,
220 .rpc_resp = &map.r_port, 220 .rpc_resp = &map.r_port,
221 }; 221 };
222 struct rpc_clnt *rpcb_clnt; 222 struct rpc_clnt *rpcb_clnt;
223 char hostname[40];
224 int status; 223 int status;
225 224
226 dprintk("RPC: %s(" NIPQUAD_FMT ", %u, %u, %d)\n", 225 dprintk("RPC: %s(" NIPQUAD_FMT ", %u, %u, %d)\n",
227 __FUNCTION__, NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot); 226 __FUNCTION__, NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
228 227
229 sprintf(hostname, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr)); 228 rpcb_clnt = rpcb_create(NULL, (struct sockaddr *)sin,
230 rpcb_clnt = rpcb_create(hostname, (struct sockaddr *)sin,
231 sizeof(sin), prot, 2, 0); 229 sizeof(sin), prot, 2, 0);
232 if (IS_ERR(rpcb_clnt)) 230 if (IS_ERR(rpcb_clnt))
233 return PTR_ERR(rpcb_clnt); 231 return PTR_ERR(rpcb_clnt);