svcrdma: Clean up read chunk counting
The byte_count argument is not used, and the function is called only from one place. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:

committed by
J. Bruce Fields

parent
83f2bedfc6
commit
2397aa8b51
@@ -365,12 +365,22 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
rdma_rcl_chunk_count(struct rpcrdma_read_chunk *ch)
|
||||
{
|
||||
unsigned int count;
|
||||
|
||||
for (count = 0; ch->rc_discrim != xdr_zero; ch++)
|
||||
count++;
|
||||
return count;
|
||||
}
|
||||
|
||||
static int rdma_read_chunks(struct svcxprt_rdma *xprt,
|
||||
struct rpcrdma_msg *rmsgp,
|
||||
struct svc_rqst *rqstp,
|
||||
struct svc_rdma_op_ctxt *head)
|
||||
{
|
||||
int page_no, ch_count, ret;
|
||||
int page_no, ret;
|
||||
struct rpcrdma_read_chunk *ch;
|
||||
u32 page_offset, byte_count;
|
||||
u64 rs_offset;
|
||||
@@ -381,8 +391,7 @@ static int rdma_read_chunks(struct svcxprt_rdma *xprt,
|
||||
if (!ch)
|
||||
return 0;
|
||||
|
||||
svc_rdma_rcl_chunk_counts(ch, &ch_count, &byte_count);
|
||||
if (ch_count > RPCSVC_MAXPAGES)
|
||||
if (rdma_rcl_chunk_count(ch) > RPCSVC_MAXPAGES)
|
||||
return -EINVAL;
|
||||
|
||||
/* The request is completed when the RDMA_READs complete. The
|
||||
|
Reference in New Issue
Block a user