From ac632bcb10fe32dee205266de0d413f24717cfb0 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Fri, 21 Dec 2012 19:48:59 -0500 Subject: [PATCH] --- yaml --- r: 347939 b: refs/heads/master c: 10532b560bacf23766f9c7dc09778b31b198ff45 h: refs/heads/master i: 347937: 41b2b5ce6418667210595eb5b5fa1796a9b7e433 347935: e0f4ea84322bf1646f61c26c00bfd0c19b51949a v: v3 --- [refs] | 2 +- trunk/fs/nfsd/vfs.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 {