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

Commit f2846481 authored Jan 21, 2015 by Chuck Lever Committed by Anna Schumaker Jan 30, 2015

xprtrdma: Clean up hdrlen



Clean up: Replace naked integers with a documenting macro.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent 052151a9

include/linux/sunrpc/rpc_rdma.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,10 @@ struct rpcrdma_msg {
		} rm_body;
		};

		#define RPCRDMA_HDRLEN_MIN 28
		/*
		* Smallest RPC/RDMA header: rm_xid through rm_type, then rm_nochunks
		*/
		#define RPCRDMA_HDRLEN_MIN (sizeof(__be32) * 7)

		enum rpcrdma_errcode {
		ERR_VERS = 1,

net/sunrpc/xprtrdma/rpc_rdma.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -472,7 +472,7 @@ rpcrdma_marshal_req(struct rpc_rqst *rqst)
		return -EIO;
		}

		hdrlen = 28; /sizeof headerp;*/
		hdrlen = RPCRDMA_HDRLEN_MIN;
		padlen = 0;

		/*
		@@ -748,7 +748,7 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep)
		}
		return;
		}
		if (rep->rr_len < 28) {
		if (rep->rr_len < RPCRDMA_HDRLEN_MIN) {
		dprintk("RPC: %s: short/invalid reply\n", __func__);
		goto repost;
		}
		@@ -830,8 +830,9 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep)
		} else {
		/* else ordinary inline */
		rdmalen = 0;
		iptr = (__be32 )((unsigned char )headerp + 28);
		rep->rr_len -= 28; /sizeof headerp;*/
		iptr = (__be32 )((unsigned char )headerp +
		RPCRDMA_HDRLEN_MIN);
		rep->rr_len -= RPCRDMA_HDRLEN_MIN;
		status = rep->rr_len;
		}
		/* Fix up the rpc results for upper layer */
		@@ -845,7 +846,8 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep)
		headerp->rm_body.rm_chunks[2] != xdr_one \|\|
		req->rl_nchunks == 0)
		goto badheader;
		iptr = (__be32 )((unsigned char )headerp + 28);
		iptr = (__be32 )((unsigned char )headerp +
		RPCRDMA_HDRLEN_MIN);
		rdmalen = rpcrdma_count_chunks(rep, req->rl_nchunks, 0, &iptr);
		if (rdmalen < 0)
		goto badheader;