[PATCH 04/15] SUNRPC: Eliminate side effects from rpc_malloc

[Chuck Lever <chuck.lever@oracle.com>]

Currently rpc_malloc sets req->rq_buffer internally.  Make this a cleaner
interface:  return a pointer to the new buffer (or NULL) and make the
caller set req->rq_buffer and req->rq_bufsize.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 net/sunrpc/clnt.c  |    5 ++++-
 net/sunrpc/sched.c |   14 +++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index f837335..244cce4 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -765,8 +765,11 @@ call_allocate(struct rpc_task *task)
 	 * auth->au_wslack */
 	bufsiz = task->tk_msg.rpc_proc->p_bufsiz + RPC_SLACK_SPACE;
 
-	if (xprt->ops->buf_alloc(task, bufsiz << 1) != NULL)
+	req->rq_buffer = xprt->ops->buf_alloc(task, bufsiz << 1);
+	if (req->rq_buffer != NULL) {
+		req->rq_bufsize = bufsiz;
 		return;
+	}
 
 	dprintk("RPC: %5u rpc_buffer allocation failed\n", task->tk_pid);
 
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index cb0c5f4..08104dd 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -749,7 +749,6 @@ static void rpc_async_schedule(struct wo
  */
 void * rpc_malloc(struct rpc_task *task, size_t size)
 {
-	struct rpc_rqst *req = task->tk_rqstp;
 	gfp_t	gfp;
 
 	if (task->tk_flags & RPC_TASK_SWAPPER)
@@ -757,16 +756,9 @@ void * rpc_malloc(struct rpc_task *task,
 	else
 		gfp = GFP_NOFS;
 
-	if (size > RPC_BUFFER_MAXSIZE) {
-		req->rq_buffer = kmalloc(size, gfp);
-		if (req->rq_buffer)
-			req->rq_bufsize = size;
-	} else {
-		req->rq_buffer = mempool_alloc(rpc_buffer_mempool, gfp);
-		if (req->rq_buffer)
-			req->rq_bufsize = RPC_BUFFER_MAXSIZE;
-	}
-	return req->rq_buffer;
+	if (size <= RPC_BUFFER_MAXSIZE)
+		return mempool_alloc(rpc_buffer_mempool, gfp);
+	return kmalloc(size, gfp);
 }
 
 /**

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs