tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

xprtrdma: Eliminate INLINE_THRESHOLD macros

Clean up: r_xprt is already available everywhere these macros are
invoked, so just dereference that directly.

RPCRDMA_INLINE_PAD_VALUE is no longer used, so it can simply be
removed.

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

authored by

Chuck Lever and committed by
Anna Schumaker eb342e9a 04fa2c6b

+6 -15
+2 -2
net/sunrpc/xprtrdma/backchannel.c
··· 46 46 return PTR_ERR(req); 47 47 req->rl_backchannel = true; 48 48 49 - size = RPCRDMA_INLINE_WRITE_THRESHOLD(rqst); 49 + size = r_xprt->rx_data.inline_wsize; 50 50 rb = rpcrdma_alloc_regbuf(ia, size, GFP_KERNEL); 51 51 if (IS_ERR(rb)) 52 52 goto out_fail; 53 53 req->rl_rdmabuf = rb; 54 54 55 - size += RPCRDMA_INLINE_READ_THRESHOLD(rqst); 55 + size += r_xprt->rx_data.inline_rsize; 56 56 rb = rpcrdma_alloc_regbuf(ia, size, GFP_KERNEL); 57 57 if (IS_ERR(rb)) 58 58 goto out_fail;
+1 -1
net/sunrpc/xprtrdma/rpc_rdma.c
··· 673 673 goto out_unmap; 674 674 hdrlen = (unsigned char *)iptr - (unsigned char *)headerp; 675 675 676 - if (hdrlen + rpclen > RPCRDMA_INLINE_WRITE_THRESHOLD(rqst)) 676 + if (hdrlen + rpclen > r_xprt->rx_data.inline_wsize) 677 677 goto out_overflow; 678 678 679 679 dprintk("RPC: %5u %s: %s/%s: hdrlen %zd rpclen %zd\n",
+3 -3
net/sunrpc/xprtrdma/transport.c
··· 518 518 return req->rl_sendbuf->rg_base; 519 519 520 520 out_rdmabuf: 521 - min_size = RPCRDMA_INLINE_WRITE_THRESHOLD(task->tk_rqstp); 521 + min_size = r_xprt->rx_data.inline_wsize; 522 522 rb = rpcrdma_alloc_regbuf(&r_xprt->rx_ia, min_size, flags); 523 523 if (IS_ERR(rb)) 524 524 goto out_fail; ··· 541 541 * reply will be large, but slush is provided here to allow 542 542 * flexibility when marshaling. 543 543 */ 544 - min_size = RPCRDMA_INLINE_READ_THRESHOLD(task->tk_rqstp); 545 - min_size += RPCRDMA_INLINE_WRITE_THRESHOLD(task->tk_rqstp); 544 + min_size = r_xprt->rx_data.inline_rsize; 545 + min_size += r_xprt->rx_data.inline_wsize; 546 546 if (size < min_size) 547 547 size = min_size; 548 548
-9
net/sunrpc/xprtrdma/xprt_rdma.h
··· 356 356 unsigned int padding; /* non-rdma write header padding */ 357 357 }; 358 358 359 - #define RPCRDMA_INLINE_READ_THRESHOLD(rq) \ 360 - (rpcx_to_rdmad(rq->rq_xprt).inline_rsize) 361 - 362 - #define RPCRDMA_INLINE_WRITE_THRESHOLD(rq)\ 363 - (rpcx_to_rdmad(rq->rq_xprt).inline_wsize) 364 - 365 - #define RPCRDMA_INLINE_PAD_VALUE(rq)\ 366 - rpcx_to_rdmad(rq->rq_xprt).padding 367 - 368 359 /* 369 360 * Statistics for RPCRDMA 370 361 */