Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10532b56 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

Revert "nfsd: warn on odd reply state in nfsd_vfs_read" 



This reverts commit 79f77bf9.

This is obviously wrong, and I have no idea how I missed seeing the
warning in testing: I must just not have looked at the right logs.  The
caller bumps rq_resused/rq_next_page, so it will always be hit on a
large enough read.

Reported-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 184e2516

fs/nfsd/vfs.c

+0 −1
Original line number Diff line number Diff line
@@ -934,7 +934,6 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, 
			.u.data		= rqstp,

		};



		WARN_ON_ONCE(rqstp->rq_next_page != rqstp->rq_respages + 1);

		rqstp->rq_next_page = rqstp->rq_respages + 1;

		host_err = splice_direct_to_actor(file, &sd, nfsd_direct_splice_actor);

	} else {