Commit 3b50cc1c authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Clean up synopsis of rpcrdma_req_create() 



Commit 1769e6a8 ("xprtrdma: Clean up rpcrdma_create_req()")
added rpcrdma_req_create() with a GFP flags argument in case a
caller might want to avoid waiting for memory.

There has never been a caller that does not pass GFP_KERNEL as
the third argument. That argument can therefore be eliminated.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 50148312

net/sunrpc/xprtrdma/backchannel.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static struct rpc_rqst *rpcrdma_bc_rqst_get(struct rpcrdma_xprt *r_xprt) 
		return NULL;



	size = min_t(size_t, r_xprt->rx_ep->re_inline_recv, PAGE_SIZE);

	req = rpcrdma_req_create(r_xprt, size, GFP_KERNEL);

	req = rpcrdma_req_create(r_xprt, size);

	if (!req)

		return NULL;

	if (rpcrdma_req_setup(r_xprt, req)) {

net/sunrpc/xprtrdma/verbs.c

+8 −8
Original line number Diff line number Diff line
@@ -800,25 +800,25 @@ void rpcrdma_mrs_refresh(struct rpcrdma_xprt *r_xprt) 
 * rpcrdma_req_create - Allocate an rpcrdma_req object

 * @r_xprt: controlling r_xprt

 * @size: initial size, in bytes, of send and receive buffers

 * @flags: GFP flags passed to memory allocators

 *

 * Returns an allocated and fully initialized rpcrdma_req or NULL.

 */

struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,

				       gfp_t flags)

struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt,

				       size_t size)

{

	struct rpcrdma_buffer *buffer = &r_xprt->rx_buf;

	struct rpcrdma_req *req;



	req = kzalloc(sizeof(*req), flags);

	req = kzalloc(sizeof(*req), GFP_KERNEL);

	if (req == NULL)

		goto out1;



	req->rl_sendbuf = rpcrdma_regbuf_alloc(size, DMA_TO_DEVICE, flags);

	req->rl_sendbuf = rpcrdma_regbuf_alloc(size, DMA_TO_DEVICE,

					       GFP_KERNEL);

	if (!req->rl_sendbuf)

		goto out2;



	req->rl_recvbuf = rpcrdma_regbuf_alloc(size, DMA_NONE, flags);

	req->rl_recvbuf = rpcrdma_regbuf_alloc(size, DMA_NONE, GFP_KERNEL);

	if (!req->rl_recvbuf)

		goto out3;
@@ -1060,8 +1060,8 @@ int rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt) 
	for (i = 0; i < r_xprt->rx_xprt.max_reqs; i++) {

		struct rpcrdma_req *req;



		req = rpcrdma_req_create(r_xprt, RPCRDMA_V1_DEF_INLINE_SIZE * 2,

					 GFP_KERNEL);

		req = rpcrdma_req_create(r_xprt,

					 RPCRDMA_V1_DEF_INLINE_SIZE * 2);

		if (!req)

			goto out;

		list_add(&req->rl_list, &buf->rb_send_bufs);

net/sunrpc/xprtrdma/xprt_rdma.h

+2 −2
Original line number Diff line number Diff line
@@ -465,8 +465,8 @@ void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, int needed, bool temp); 
/*

 * Buffer calls - xprtrdma/verbs.c

 */

struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,

				       gfp_t flags);

struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt,

				       size_t size);

int rpcrdma_req_setup(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req);

void rpcrdma_req_destroy(struct rpcrdma_req *req);

int rpcrdma_buffer_create(struct rpcrdma_xprt *);