aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-07 21:16:56 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-30 02:06:06 -0500
commit86d61d8638ddf9cdf87df26c7fa69b2804425fbe (patch)
tree881e245cd44cc3354e5d60adc3a5b8907ef4f4bf /net
parentb454ae906085cf7774fb4756746680c9b03b6f84 (diff)
SUNRPC: Fix up constant string declarations in struct rpcbind_args
...and eliminate an unnecessary cast. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/rpcb_clnt.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index b60fa92321a5..a6cd35883fa7 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -73,9 +73,9 @@ struct rpcbind_args {
73 u32 r_vers; 73 u32 r_vers;
74 u32 r_prot; 74 u32 r_prot;
75 unsigned short r_port; 75 unsigned short r_port;
76 char * r_netid; 76 const char * r_netid;
77 char r_addr[RPCBIND_MAXUADDRLEN]; 77 const char * r_addr;
78 char * r_owner; 78 const char * r_owner;
79}; 79};
80 80
81static struct rpc_procinfo rpcb_procedures2[]; 81static struct rpc_procinfo rpcb_procedures2[];
@@ -358,10 +358,8 @@ 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 = (char *)rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID); 361 map->r_netid = rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID);
362 memcpy(map->r_addr, 362 map->r_addr = rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR);
363 rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR),
364 sizeof(map->r_addr));
365 map->r_owner = RPCB_OWNER_STRING; /* ignored for GETADDR */ 363 map->r_owner = RPCB_OWNER_STRING; /* ignored for GETADDR */
366 364
367 child = rpcb_call_async(rpcb_clnt, map, xprt->bind_index); 365 child = rpcb_call_async(rpcb_clnt, map, xprt->bind_index);