[PATCH 001 of 4] Copy intr and soft flags to portmap-bind client

[NeilBrown <neilb@suse.de>]

When an RPC request needs to make a subordinate RPC request to portmap
to find the port number to communicate with, the 'soft' and 'intr'
flags should be copied from the original request to the subordinate request
to ensure consistent handling.

Currently the pmap client defaults to soft,nointr, so while it is
certain to timeout, it could still be 30 seconds without being
interruptible.

Note that copying the 'hard' flag down is not essential as if the pmap
request aborts, the parent request - being hard - will retry it
indefinitely.  However copying it is more obviously right.

Signed-off-by: Neil Brown <neilb@suse.de>

### Diffstat output
 ./net/sunrpc/pmap_clnt.c |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff .prev/net/sunrpc/pmap_clnt.c ./net/sunrpc/pmap_clnt.c
--- .prev/net/sunrpc/pmap_clnt.c	2006-10-24 09:23:13.000000000 +1000
+++ ./net/sunrpc/pmap_clnt.c	2006-10-24 09:33:08.000000000 +1000
@@ -34,7 +34,8 @@ struct portmap_args {
 };
 
 static struct rpc_procinfo	pmap_procedures[];
-static struct rpc_clnt *	pmap_create(char *, struct sockaddr_in *, int, int);
+static struct rpc_clnt *	pmap_create(char *, struct sockaddr_in *,
+					    int, unsigned long);
 static void			pmap_getport_done(struct rpc_task *, void *);
 static struct rpc_program	pmap_program;
 
@@ -93,6 +94,7 @@ void rpc_getport(struct rpc_task *task)
 	struct rpc_clnt	*pmap_clnt;
 	struct rpc_task *child;
 	int status;
+	unsigned long create_flags;
 
 	dprintk("RPC: %4d rpc_getport(%s, %u, %u, %d)\n",
 			task->tk_pid, clnt->cl_server,
@@ -125,7 +127,13 @@ void rpc_getport(struct rpc_task *task)
 	map->pm_xprt = xprt_get(xprt);
 
 	rpc_peeraddr(clnt, (struct sockaddr *) &addr, sizeof(addr));
-	pmap_clnt = pmap_create(clnt->cl_server, &addr, map->pm_prot, 0);
+	create_flags = RPC_CLNT_CREATE_NONPRIVPORT;
+	if ( ! RPC_IS_SOFT(task))
+		create_flags |= RPC_CLNT_CREATE_HARDRTRY;
+	if ( ! RPC_TASK_UNINTERRUPTIBLE(task))
+		create_flags |= RPC_CLNT_CREATE_INTR;
+	pmap_clnt = pmap_create(clnt->cl_server, &addr, map->pm_prot,
+				create_flags);
 	status = PTR_ERR(pmap_clnt);
 	if (IS_ERR(pmap_clnt))
 		goto bailout;
@@ -178,7 +186,7 @@ int rpc_getport_external(struct sockaddr
 			NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
 
 	sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(sin->sin_addr.s_addr));
-	pmap_clnt = pmap_create(hostname, sin, prot, 0);
+	pmap_clnt = pmap_create(hostname, sin, prot, RPC_CLNT_CREATE_NONPRIVPORT);
 	if (IS_ERR(pmap_clnt))
 		return PTR_ERR(pmap_clnt);
 
@@ -257,7 +265,7 @@ int rpc_register(u32 prog, u32 vers, int
 	dprintk("RPC: registering (%u, %u, %d, %u) with portmapper.\n",
 			prog, vers, prot, port);
 
-	pmap_clnt = pmap_create("localhost", &sin, IPPROTO_UDP, 1);
+	pmap_clnt = pmap_create("localhost", &sin, IPPROTO_UDP, 0);
 	if (IS_ERR(pmap_clnt)) {
 		error = PTR_ERR(pmap_clnt);
 		dprintk("RPC: couldn't create pmap client. Error = %d\n", error);
@@ -277,7 +285,8 @@ int rpc_register(u32 prog, u32 vers, int
 	return error;
 }
 
-static struct rpc_clnt *pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto, int privileged)
+static struct rpc_clnt *pmap_create(char *hostname, struct sockaddr_in *srvaddr,
+				    int proto, unsigned long create_flags)
 {
 	struct rpc_create_args args = {
 		.protocol	= proto,
@@ -292,8 +301,7 @@ static struct rpc_clnt *pmap_create(char
 	};
 
 	srvaddr->sin_port = htons(RPC_PMAP_PORT);
-	if (!privileged)
-		args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
+	args.flags |= create_flags;
 	return rpc_create(&args);
 }
 

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs