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

svcrdma: Clean up RPCRDMA_DEF_GFP 



xprt_rdma_bc_allocate() is now the only user of RPCRDMA_DEF_GFP.
Replace that macro with the raw flags.

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

net/sunrpc/xprtrdma/svc_rdma_backchannel.c

+2 −2
Original line number Diff line number Diff line
@@ -119,12 +119,12 @@ xprt_rdma_bc_allocate(struct rpc_task *task) 
		return -EINVAL;

	}



	page = alloc_page(RPCRDMA_DEF_GFP);

	page = alloc_page(GFP_NOIO | __GFP_NOWARN);

	if (!page)

		return -ENOMEM;

	rqst->rq_buffer = page_address(page);



	rqst->rq_rbuffer = kmalloc(rqst->rq_rcvsize, RPCRDMA_DEF_GFP);

	rqst->rq_rbuffer = kmalloc(rqst->rq_rcvsize, GFP_NOIO | __GFP_NOWARN);

	if (!rqst->rq_rbuffer) {

		put_page(page);

		return -ENOMEM;

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ static inline void *rdmab_data(const struct rpcrdma_regbuf *rb) 
	return rb->rg_data;

}



#define RPCRDMA_DEF_GFP		(GFP_NOIO | __GFP_NOWARN)



/* To ensure a transport can always make forward progress,

 * the number of RDMA segments allowed in header chunk lists

 * is capped at 16. This prevents less-capable devices from