diff --git a/[refs] b/[refs] index c1cb014295af..d5571bcf0572 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 184e2516614f7055d4c3a2e63fd8a3eb95fff6d6 +refs/heads/master: 10532b560bacf23766f9c7dc09778b31b198ff45 diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c index f0a6d88d7fff..d586117fa94a 100644 --- a/trunk/fs/nfsd/vfs.c +++ b/trunk/fs/nfsd/vfs.c @@ -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 {