Permalink
Browse files

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

This reverts commit 79f77bf.

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: Dave Jones <davej@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information...
1 parent 184e251 commit 10532b560bacf23766f9c7dc09778b31b198ff45 J. Bruce Fields committed with Dec 22, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 fs/nfsd/vfs.c
View
@@ -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 {

0 comments on commit 10532b5

Please sign in to comment.