diff options
| author | Ralph Boehme <slow@samba.org> | 2017-06-09 13:02:49 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2017-07-03 19:59:08 +0200 |
| commit | 3645f83a3c83fa3e4bf4dbacf885cc4295e7eadd (patch) | |
| tree | 7b14b55f4f51eb63d786b91f5c0533f4d5df611f /source3/include/vfs_macros.h | |
| parent | d50f307e97ae28b9fbdc2e6cffb1b5493c583a09 (diff) | |
| download | samba-3645f83a3c83fa3e4bf4dbacf885cc4295e7eadd.tar.gz | |
s3/vfs: make SMB_VFS_OFFLOAD_WRITE_SEND offload token based
Remove the source fsp argument and instead pass the offload token
generated with SMB_VFS_OFFLOAD_READ_SEND/RECV.
An actual offload fsctl is not implemented yet, neither in the VFS nor
at the SMB ioctl layer, and returns NT_STATUS_NOT_IMPLEMENTED
With these changes we now pass the copy-chunk-across-shares test.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/include/vfs_macros.h')
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 2d810d0aa80..77a2a8d37a2 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -425,10 +425,10 @@ #define SMB_VFS_NEXT_OFFLOAD_READ_RECV(req, handle, mem_ctx, token_blob) \ smb_vfs_call_offload_read_recv((req), (handle)->next, (mem_ctx), (token_blob)) -#define SMB_VFS_OFFLOAD_WRITE_SEND(conn, mem_ctx, ev, src_fsp, src_off, dest_fsp, dest_off, num, flags) \ - smb_vfs_call_offload_write_send((conn)->vfs_handles, (mem_ctx), (ev), (src_fsp), (src_off), (dest_fsp), (dest_off), (num), (flags)) -#define SMB_VFS_NEXT_OFFLOAD_WRITE_SEND(handle, mem_ctx, ev, src_fsp, src_off, dest_fsp, dest_off, num, flags) \ - smb_vfs_call_offload_write_send((handle)->next, (mem_ctx), (ev), (src_fsp), (src_off), (dest_fsp), (dest_off), (num), (flags)) +#define SMB_VFS_OFFLOAD_WRITE_SEND(conn, mem_ctx, ev, fsctl, token, transfer_offset, dest_fsp, dest_off, num, flags) \ + smb_vfs_call_offload_write_send((conn)->vfs_handles, (mem_ctx), (ev), (fsctl), (token), (transfer_offset), (dest_fsp), (dest_off), (num), (flags)) +#define SMB_VFS_NEXT_OFFLOAD_WRITE_SEND(handle, mem_ctx, ev, fsctl, token, transfer_offset, dest_fsp, dest_off, num, flags) \ + smb_vfs_call_offload_write_send((handle)->next, (mem_ctx), (ev), (fsctl), (token), (transfer_offset), (dest_fsp), (dest_off), (num), (flags)) #define SMB_VFS_OFFLOAD_WRITE_RECV(conn, req, copied) \ smb_vfs_call_offload_write_recv((conn)->vfs_handles, (req), (copied)) |