Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

xprtrdma: Remove rpcrdma_create_data_internal::rsize and wsize 



Clean up.

xprt_rdma_max_inline_{read,write} cannot be set to large values
by virtue of proc_dointvec_minmax. The current maximum is
RPCRDMA_MAX_INLINE, which is much smaller than RPCRDMA_MAX_SEGS *
PAGE_SIZE.

The .rsize and .wsize fields are otherwise unused in the current
code base, and thus can be removed.

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

net/sunrpc/xprtrdma/transport.c

+0 −9
Original line number Diff line number Diff line
@@ -350,17 +350,8 @@ xprt_setup_rdma(struct xprt_create *args) 
	xprt_rdma_format_addresses(xprt, sap);



	cdata.max_requests = xprt_rdma_slot_table_entries;



	cdata.rsize = RPCRDMA_MAX_SEGS * PAGE_SIZE; /* RDMA write max */

	cdata.wsize = RPCRDMA_MAX_SEGS * PAGE_SIZE; /* RDMA read max */



	cdata.inline_wsize = xprt_rdma_max_inline_write;

	if (cdata.inline_wsize > cdata.wsize)

		cdata.inline_wsize = cdata.wsize;



	cdata.inline_rsize = xprt_rdma_max_inline_read;

	if (cdata.inline_rsize > cdata.rsize)

		cdata.inline_rsize = cdata.rsize;



	/*

	 * Create new transport instance, which includes initialized

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −2
Original line number Diff line number Diff line
@@ -419,8 +419,6 @@ enum { 
 */

struct rpcrdma_create_data_internal {

	unsigned int	max_requests;	/* max requests (slots) in flight */

	unsigned int	rsize;		/* mount rsize - max read hdr+data */

	unsigned int	wsize;		/* mount wsize - max write hdr+data */

	unsigned int	inline_rsize;	/* max non-rdma read data payload */

	unsigned int	inline_wsize;	/* max non-rdma write data payload */

};