diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2007-06-12 15:22:14 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-10 02:04:14 -0400 |
commit | cf8208d0eabd1d5d2625ec02a175a294c3f30d36 (patch) | |
tree | 7dd1f75873a2d84a3c626ecd45640d42c1b5dfcf /net | |
parent | f0930fffa99e7fe0a0c4b6c7d9a244dc88288c27 (diff) |
sendfile: convert nfsd to splice_direct_to_actor()
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 2 | ||||
-rw-r--r-- | net/sunrpc/svc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 099a983797da..c094583386fd 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c | |||
@@ -853,7 +853,7 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs | |||
853 | u32 priv_len, maj_stat; | 853 | u32 priv_len, maj_stat; |
854 | int pad, saved_len, remaining_len, offset; | 854 | int pad, saved_len, remaining_len, offset; |
855 | 855 | ||
856 | rqstp->rq_sendfile_ok = 0; | 856 | rqstp->rq_splice_ok = 0; |
857 | 857 | ||
858 | priv_len = svc_getnl(&buf->head[0]); | 858 | priv_len = svc_getnl(&buf->head[0]); |
859 | if (rqstp->rq_deferred) { | 859 | if (rqstp->rq_deferred) { |
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index e673ef993904..55ea6df069de 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
@@ -814,7 +814,7 @@ svc_process(struct svc_rqst *rqstp) | |||
814 | rqstp->rq_res.tail[0].iov_base = NULL; | 814 | rqstp->rq_res.tail[0].iov_base = NULL; |
815 | rqstp->rq_res.tail[0].iov_len = 0; | 815 | rqstp->rq_res.tail[0].iov_len = 0; |
816 | /* Will be turned off only in gss privacy case: */ | 816 | /* Will be turned off only in gss privacy case: */ |
817 | rqstp->rq_sendfile_ok = 1; | 817 | rqstp->rq_splice_ok = 1; |
818 | /* tcp needs a space for the record length... */ | 818 | /* tcp needs a space for the record length... */ |
819 | if (rqstp->rq_prot == IPPROTO_TCP) | 819 | if (rqstp->rq_prot == IPPROTO_TCP) |
820 | svc_putnl(resv, 0); | 820 | svc_putnl(resv, 0); |