diff options
author | Michael Adam <obnox@samba.org> | 2008-01-11 00:51:19 +0100 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2008-01-11 01:27:05 +0100 |
commit | 4caab9ca25e1163378714de825d835e79e27dd4f (patch) | |
tree | 9a7b06f3756a9f4c0ae45c13dbad7d13929a7e5f /source3/modules/vfs_default.c | |
parent | 13785d5c62093540139094f6dfcf808100790939 (diff) | |
download | samba-4caab9ca25e1163378714de825d835e79e27dd4f.tar.gz samba-4caab9ca25e1163378714de825d835e79e27dd4f.tar.xz samba-4caab9ca25e1163378714de825d835e79e27dd4f.zip |
Combine fsp and fromfd to fromfsp in SMB_VFS_SENDFILE().
Michael
(This used to be commit a52cfb7d777157c93c9dc26c67f457be592dd537)
Diffstat (limited to 'source3/modules/vfs_default.c')
-rw-r--r-- | source3/modules/vfs_default.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index e57d24cb1a..3a0ed0bebd 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -337,13 +337,13 @@ static SMB_OFF_T vfswrap_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB return result; } -static ssize_t vfswrap_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fsp, int fromfd, const DATA_BLOB *hdr, +static ssize_t vfswrap_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n) { ssize_t result; START_PROFILE_BYTES(syscall_sendfile, n); - result = sys_sendfile(tofd, fromfd, hdr, offset, n); + result = sys_sendfile(tofd, fromfsp->fh->fd, hdr, offset, n); END_PROFILE(syscall_sendfile); return result; } |