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

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

xprtrdma: Remove unused padding variables 



Clean up. Remove fields that should have been removed by
commit b3221d6a ("xprtrdma: Remove logic that constructs
RDMA_MSGP type calls").

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

net/sunrpc/xprtrdma/transport.c

+3 −6
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
static unsigned int xprt_rdma_slot_table_entries = RPCRDMA_DEF_SLOT_TABLE;

unsigned int xprt_rdma_max_inline_read = RPCRDMA_DEF_INLINE;

static unsigned int xprt_rdma_max_inline_write = RPCRDMA_DEF_INLINE;

static unsigned int xprt_rdma_inline_write_padding;

unsigned int xprt_rdma_memreg_strategy		= RPCRDMA_FRMR;

int xprt_rdma_pad_optimize;
@@ -81,6 +80,7 @@ static unsigned int zero; 
static unsigned int max_padding = PAGE_SIZE;

static unsigned int min_memreg = RPCRDMA_BOUNCEBUFFERS;

static unsigned int max_memreg = RPCRDMA_LAST - 1;

static unsigned int dummy;



static struct ctl_table_header *sunrpc_table_header;
@@ -114,7 +114,7 @@ static struct ctl_table xr_tunables_table[] = { 
	},

	{

		.procname	= "rdma_inline_write_padding",

		.data		= &xprt_rdma_inline_write_padding,

		.data		= &dummy,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,
@@ -387,8 +387,6 @@ xprt_setup_rdma(struct xprt_create *args) 
	if (cdata.inline_rsize > cdata.rsize)

		cdata.inline_rsize = cdata.rsize;



	cdata.padding = xprt_rdma_inline_write_padding;



	/*

	 * Create new transport instance, which includes initialized

	 *  o ia
@@ -895,8 +893,7 @@ int xprt_rdma_init(void) 
		"\tMaxInlineRead %d\n\tMaxInlineWrite %d\n",

		xprt_rdma_slot_table_entries,

		xprt_rdma_max_inline_read, xprt_rdma_max_inline_write);

	dprintk("\tPadding %d\n\tMemreg %d\n",

		xprt_rdma_inline_write_padding, xprt_rdma_memreg_strategy);

	dprintk("\tPadding 0\n\tMemreg %d\n", xprt_rdma_memreg_strategy);



#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

	if (!sunrpc_table_header)

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −1
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ struct rpcrdma_create_data_internal { 
	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 */

	unsigned int	padding;	/* non-rdma write header padding */

};



/*