Commit:     4fbef206daead133085fe33905f5e842d38fb8da
Parent:     4fd885170bf13841ada921495b7b00c4b9971cf9
Author:     Jens Axboe <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 13 22:42:20 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Jul 13 16:45:43 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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,
                       = rqstp,
+               rqstp->rq_resused = 1;
                host_err = splice_direct_to_actor(file, &sd, 
        } else {
                oldfs = get_fs();
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to