aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/rpcb_clnt.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-01-07 18:34:48 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-30 02:06:04 -0500
commitb454ae906085cf7774fb4756746680c9b03b6f84 (patch)
treec5f84a9524dd7a9c7470ef0782e2d79df94d3f5e /net/sunrpc/rpcb_clnt.c
parentcab6fc1b77c3ec4471d7d54ff6db9ad2dd59c2f5 (diff)
SUNRPC: fewer conditionals in the format_ip_address routines
Clean up: have the set up routines explicitly pass the strings to be used for the transport name and NETID. This removes a number of conditionals and dependencies on rpc_xprt.prot, which is overloaded. Tighten up type checking on the address_strings array while we're at it. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/rpcb_clnt.c')
-rw-r--r--net/sunrpc/rpcb_clnt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index f494e58910ec..b60fa92321a5 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -358,7 +358,7 @@ void rpcb_getport_async(struct rpc_task *task)
358 map->r_prot = xprt->prot; 358 map->r_prot = xprt->prot;
359 map->r_port = 0; 359 map->r_port = 0;
360 map->r_xprt = xprt_get(xprt); 360 map->r_xprt = xprt_get(xprt);
361 map->r_netid = rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID); 361 map->r_netid = (char *)rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID);
362 memcpy(map->r_addr, 362 memcpy(map->r_addr,
363 rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR), 363 rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR),
364 sizeof(map->r_addr)); 364 sizeof(map->r_addr));