diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-07-13 22:42:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-13 16:45:43 -0700 |
| commit | 4fbef206daead133085fe33905f5e842d38fb8da (patch) | |
| tree | 94689f4fc018e0a599db08a6902fbc079d33c07e /fs/nfsd | |
| parent | 4fd885170bf13841ada921495b7b00c4b9971cf9 (diff) | |
| download | op-kernel-dev-4fbef206daead133085fe33905f5e842d38fb8da.zip op-kernel-dev-4fbef206daead133085fe33905f5e842d38fb8da.tar.gz | |
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>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 8604e35..945b1ce 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(); |
