Skip to content

Commit

Permalink
NFSD: Clean up nfsd_splice_actor()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chuck Lever committed May 19, 2022
1 parent 42226c9 commit 91e23b1
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions fs/nfsd/vfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,17 +849,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;
}

Expand Down

0 comments on commit 91e23b1

Please sign in to comment.