Browse Source

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>
Jens Axboe 18 years ago
parent
commit
4fbef206da
1 changed files with 1 additions and 0 deletions
  1. 1 0
      fs/nfsd/vfs.c

+ 1 - 0
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,
 			.u.data		= rqstp,
 		};
 		};
 
 
+		rqstp->rq_resused = 1;
 		host_err = splice_direct_to_actor(file, &sd, nfsd_direct_splice_actor);
 		host_err = splice_direct_to_actor(file, &sd, nfsd_direct_splice_actor);
 	} else {
 	} else {
 		oldfs = get_fs();
 		oldfs = get_fs();