Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86d61d86 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Fix up constant string declarations in struct rpcbind_args 



...and eliminate an unnecessary cast.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b454ae90

net/sunrpc/rpcb_clnt.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -73,9 +73,9 @@ struct rpcbind_args { 
	u32			r_vers;

	u32			r_vers;

	u32			r_prot;

	u32			r_prot;

	unsigned short		r_port;

	unsigned short		r_port;

	char *			r_netid;

	const char *		r_netid;

	char			r_addr[RPCBIND_MAXUADDRLEN];

	const char *		r_addr;

	char *			r_owner;

	const char *		r_owner;

};

};





static struct rpc_procinfo rpcb_procedures2[];

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_prot = xprt->prot;

	map->r_port = 0;

	map->r_port = 0;

	map->r_xprt = xprt_get(xprt);

	map->r_xprt = xprt_get(xprt);

	map->r_netid = (char *)rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID);

	map->r_netid = rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID);

	memcpy(map->r_addr,

	map->r_addr = rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR);

	       rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR),

	       sizeof(map->r_addr));

	map->r_owner = RPCB_OWNER_STRING;	/* ignored for GETADDR */

	map->r_owner = RPCB_OWNER_STRING;	/* ignored for GETADDR */





	child = rpcb_call_async(rpcb_clnt, map, xprt->bind_index);

	child = rpcb_call_async(rpcb_clnt, map, xprt->bind_index);