diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-08 03:16:56 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-30 08:06:06 +0100 |
| commit | 86d61d8638ddf9cdf87df26c7fa69b2804425fbe (patch) | |
| tree | 881e245cd44cc3354e5d60adc3a5b8907ef4f4bf /net | |
| parent | SUNRPC: fewer conditionals in the format_ip_address routines (diff) | |
| download | linux-86d61d8638ddf9cdf87df26c7fa69b2804425fbe.tar.xz linux-86d61d8638ddf9cdf87df26c7fa69b2804425fbe.zip | |
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.c | 12 |
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 { u32 r_vers; u32 r_prot; unsigned short r_port; - char * r_netid; - char r_addr[RPCBIND_MAXUADDRLEN]; - char * r_owner; + const char * r_netid; + const char * r_addr; + const char * r_owner; }; static struct rpc_procinfo rpcb_procedures2[]; @@ -358,10 +358,8 @@ void rpcb_getport_async(struct rpc_task *task) map->r_prot = xprt->prot; map->r_port = 0; map->r_xprt = xprt_get(xprt); - map->r_netid = (char *)rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID); - memcpy(map->r_addr, - rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR), - sizeof(map->r_addr)); + map->r_netid = rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID); + map->r_addr = rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR); map->r_owner = RPCB_OWNER_STRING; /* ignored for GETADDR */ child = rpcb_call_async(rpcb_clnt, map, xprt->bind_index); |