summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2020-06-17 15:19:36 -0400
committerChuck Lever <chuck.lever@oracle.com>2020-11-30 13:00:23 -0500
commit7954c8503b8709660d93505a40f1847634d9c3ba (patch)
tree79504c968581a72193d11880d56a63fc59f99565
parent41bc163ffe0fe67cba3fff2f5e8c58caa9e46a1e (diff)
downloadlinux-next-7954c8503b8709660d93505a40f1847634d9c3ba.tar.gz
svcrdma: Remove chunk list pointers
Clean up: These pointers are no longer used. Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-rw-r--r--include/linux/sunrpc/svc_rdma.h4
-rw-r--r--net/sunrpc/xprtrdma/svc_rdma_recvfrom.c8
2 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
index 85fbec47d4b5..6f247d043731 100644
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -149,12 +149,8 @@ struct svc_rdma_recv_ctxt {
struct svc_rdma_pcl rc_call_pcl;
struct svc_rdma_pcl rc_read_pcl;
-
- __be32 *rc_write_list;
struct svc_rdma_chunk *rc_cur_result_payload;
struct svc_rdma_pcl rc_write_pcl;
-
- __be32 *rc_reply_chunk;
struct svc_rdma_pcl rc_reply_pcl;
struct page *rc_pages[RPCSVC_MAXPAGES];
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index af32c3ad45a6..dd10b1de227d 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -540,17 +540,13 @@ static bool xdr_check_write_list(struct svc_rdma_recv_ctxt *rctxt)
p = xdr_inline_decode(&rctxt->rc_stream, sizeof(*p));
if (!p)
return false;
-
- rctxt->rc_write_list = NULL;
if (!xdr_count_write_chunks(rctxt, p))
return false;
if (!pcl_alloc_write(rctxt, &rctxt->rc_write_pcl, p))
return false;
- if (!pcl_is_empty(&rctxt->rc_write_pcl))
- rctxt->rc_write_list = p;
rctxt->rc_cur_result_payload = pcl_first_chunk(&rctxt->rc_write_pcl);
- return rctxt->rc_write_pcl.cl_count < 2;
+ return true;
}
/* Sanity check the Reply chunk.
@@ -573,13 +569,11 @@ static bool xdr_check_reply_chunk(struct svc_rdma_recv_ctxt *rctxt)
if (!p)
return false;
- rctxt->rc_reply_chunk = NULL;
if (!xdr_item_is_present(p))
return true;
if (!xdr_check_write_chunk(rctxt))
return false;
- rctxt->rc_reply_chunk = p;
rctxt->rc_reply_pcl.cl_count = 1;
return pcl_alloc_write(rctxt, &rctxt->rc_reply_pcl, p);
}