aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-09-11 18:00:15 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:16:40 -0400
commit6d0aa06afd62a868d83c6021335622a316469527 (patch)
treee14b13b31361295a91a37146f42f43a244224edf
parent89eb21c35b61b5157940e1b78c2c6d0529d11c63 (diff)
SUNRPC: Use correct argument type in memcpy()
Noticed by Tom Talpey <tmt@netapp.com>: OBTW, there's a nit on that memcpy, too. The r_addr is an array, so memcpy(&map->r_addr is passing the address of the array as a char **. It's the same as map->r_addr, but technically the wrong type. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 0bb6709018de..f88ab90b8d34 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -410,7 +410,7 @@ void rpcb_getport_async(struct rpc_task *task)
410 map->r_xprt = xprt_get(xprt); 410 map->r_xprt = xprt_get(xprt);
411 map->r_netid = (xprt->prot == IPPROTO_TCP) ? RPCB_NETID_TCP : 411 map->r_netid = (xprt->prot == IPPROTO_TCP) ? RPCB_NETID_TCP :
412 RPCB_NETID_UDP; 412 RPCB_NETID_UDP;
413 memcpy(&map->r_addr, 413 memcpy(map->r_addr,
414 rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR), 414 rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR),
415 sizeof(map->r_addr)); 415 sizeof(map->r_addr));
416 map->r_owner = RPCB_OWNER_STRING; /* ignored for GETADDR */ 416 map->r_owner = RPCB_OWNER_STRING; /* ignored for GETADDR */