Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: Clean up nfsd_splice_actor()

Browse source 
[ 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2022-04-07 16:48:24 -04:00 • committed by Ksawlii
parent b1713b4bc8
commit d98ea952eb
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/nfsd/vfs.c
View file

@ -873,17 +873,11 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
struct splice_desc *sd) struct splice_desc *sd)
{ {
struct svc_rqst *rqstp = sd->u.data; 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, buf->page);
svc_rqst_replace_page(rqstp, page); if (rqstp->rq_res.page_len == 0)
rqstp->rq_res.page_base = buf->offset; 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; rqstp->rq_res.page_len += sd->len;
return sd->len; return sd->len;
} }