nfsd: fix nfsd_vfs_read() splice actor setup
authorJens Axboe <jens.axboe@oracle.com>
Fri, 13 Jul 2007 20:42:20 +0000 (22:42 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 13 Jul 2007 23:45:43 +0000 (16:45 -0700)
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>
fs/nfsd/vfs.c

index 8604e35bd48e2d5966a244f1763f62def303dc0a..945b1cedde2bd2d0bd489b2faf74269f884166c2 100644 (file)
@@ -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();