diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-03 09:26:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-03 09:26:34 -0700 |
| commit | 7bafbd4027ae86572f308c4ddf93120c90126332 (patch) | |
| tree | 05c09a5bfd8405fd5904e7f90ade3b31099c5cf5 /fs/nfsd | |
| parent | 556c9424e271abff7ada9196007418f7b8431c6e (diff) | |
| parent | 101df45e7ec36f470559c8fdab8e272cb991ef42 (diff) | |
| download | linux-starfive-7bafbd4027ae86572f308c4ddf93120c90126332.tar.gz linux-starfive-7bafbd4027ae86572f308c4ddf93120c90126332.tar.bz2 linux-starfive-7bafbd4027ae86572f308c4ddf93120c90126332.zip | |
Merge tag 'nfsd-6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever:
- Fix tmpfs splice read support
* tag 'nfsd-6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
nfsd: Fix reading via splice
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 8a2321d19194..2c9074ab2315 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -956,10 +956,13 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, last_page = page + (offset + sd->len - 1) / PAGE_SIZE; for (page += offset / PAGE_SIZE; page <= last_page; page++) { /* - * Skip page replacement when extending the contents - * of the current page. + * Skip page replacement when extending the contents of the + * current page. But note that we may get two zero_pages in a + * row from shmem. */ - if (page == *(rqstp->rq_next_page - 1)) + if (page == *(rqstp->rq_next_page - 1) && + offset_in_page(rqstp->rq_res.page_base + + rqstp->rq_res.page_len)) continue; if (unlikely(!svc_rqst_replace_page(rqstp, page))) return -EIO; |