Commit 7bafbd40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 556c9424 101df45e

fs/nfsd/vfs.c

+6 −3
Original line number Diff line number Diff line
@@ -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;