diff options
author | Jeremy Allison <jra@samba.org> | 2010-12-14 13:36:08 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2010-12-15 02:24:08 +0100 |
commit | a8eed184a0f9e5fdeec9a40d8ffbc2f3d56beb74 (patch) | |
tree | e530aa4d3887683dd5e84b25d1735193122ffbab /source3/smbd/smb2_server.c | |
parent | e071fd711dee0a5b03df53979b355f2e5a2e58b0 (diff) | |
download | samba-a8eed184a0f9e5fdeec9a40d8ffbc2f3d56beb74.tar.gz samba-a8eed184a0f9e5fdeec9a40d8ffbc2f3d56beb74.tar.bz2 samba-a8eed184a0f9e5fdeec9a40d8ffbc2f3d56beb74.zip |
Implement "use sendfile = yes" for SMB2. (cherry picked from commit 95cb7adcd03a1abbd0af395b6c96dd8e0eebd3d1)
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Dec 15 02:24:08 CET 2010 on sn-devel-104
Diffstat (limited to 'source3/smbd/smb2_server.c')
-rw-r--r-- | source3/smbd/smb2_server.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 8dbf3276c0..924e41fa48 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -1487,6 +1487,15 @@ static NTSTATUS smbd_smb2_request_reply(struct smbd_smb2_request *req) print_req_vectors(req); } + /* I am a sick, sick man... :-). Sendfile hack ... JRA. */ + if (req->out.vector_count == 4 && + req->out.vector[3].iov_base == NULL && + req->out.vector[3].iov_len != 0) { + /* Dynamic part is NULL. Chop it off, + We're going to send it via sendfile. */ + req->out.vector_count -= 1; + } + subreq = tstream_writev_queue_send(req, req->sconn->smb2.event_ctx, req->sconn->smb2.stream, |