NFSD: Clean up nfsd_splice_actor()

[ Upstream commit 91e23b1c39820bfed642119ff6b6ef9f43cf09ce ]

nfsd_splice_actor() checks that the page being spliced does not
match the previous element in the svc_rqst::rq_pages array. We
believe this is to prevent a double put_page() in cases where the
READ payload is partially contained in the xdr_buf's head buffer.

However, the NFSD READ proc functions no longer place any part of
the READ payload in the head buffer, in order to properly support
NFS/RDMA READ with Write chunks. Therefore, simplify the logic in
nfsd_splice_actor() to remove this unnecessary check.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 00e956bdefaae0e61b5f03ae68bc0a27b599e392..541f39ab450ce027b5ee681b06174b264f98ce3e 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -856,17 +856,11 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
                  struct splice_desc *sd)
 {
        struct svc_rqst *rqstp = sd->u.data;
-       struct page **pp = rqstp->rq_next_page;
-       struct page *page = buf->page;
 
-       if (rqstp->rq_res.page_len == 0) {
-               svc_rqst_replace_page(rqstp, page);
+       svc_rqst_replace_page(rqstp, buf->page);
+       if (rqstp->rq_res.page_len == 0)
                rqstp->rq_res.page_base = buf->offset;
-       } else if (page != pp[-1]) {
-               svc_rqst_replace_page(rqstp, page);
-       }
        rqstp->rq_res.page_len += sd->len;
-
        return sd->len;
 }