From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 13 Jul 2007 20:42:20 +0000 (+0200)
Subject: nfsd: fix nfsd_vfs_read() splice actor setup
X-Git-Tag: MMI-PSA29.97-13-9~42263
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4fbef206daead133085fe33905f5e842d38fb8da;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

nfsd: fix nfsd_vfs_read() splice actor setup

When nfsd was transitioned to use splice instead of sendfile() for data
transfers, a line setting the page index was lost. Restore it, so that
nfsd is functional when that path is used.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 8604e35bd48e..945b1cedde2b 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -879,6 +879,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 			.u.data		= rqstp,
 		};
 
+		rqstp->rq_resused = 1;
 		host_err = splice_direct_to_actor(file, &sd, nfsd_direct_splice_actor);
 	} else {
 		oldfs = get_fs();