diff options
| author | Ralph Boehme <slow@samba.org> | 2017-06-10 09:05:55 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2017-07-03 19:59:08 +0200 |
| commit | 2d01558ad3d9452c8c64a30e5bf143b4bdc3e207 (patch) | |
| tree | 245c4b437a8a65534e11cbad27cacac9cd8ee6f3 /source3/smbd | |
| parent | fe6d71d7f978c4db8401ccff3cce17c9368b24e4 (diff) | |
| download | samba-2d01558ad3d9452c8c64a30e5bf143b4bdc3e207.tar.gz | |
s3/smbd: remove unneeded flags argument from SMB_VFS_OFFLOAD_WRITE_SEND
...and instead use the fsctl to infer required behaviour in the VFS
backends.
Note that this removes the check from vfs_default because there we only
handle FSCTL_SRV_COPYCHUNK(_WRITE) and must always perform the lock
checks.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/smb2_ioctl_filesys.c | 4 | ||||
| -rw-r--r-- | source3/smbd/smb2_ioctl_network_fs.c | 3 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/source3/smbd/smb2_ioctl_filesys.c b/source3/smbd/smb2_ioctl_filesys.c index fa1cb93c439..732e3ab96fc 100644 --- a/source3/smbd/smb2_ioctl_filesys.c +++ b/source3/smbd/smb2_ioctl_filesys.c @@ -295,9 +295,7 @@ static void fsctl_dup_extents_offload_read_done(struct tevent_req *subreq) state->dup_extents.source_off, state->dst_fsp, state->dup_extents.target_off, - state->dup_extents.byte_count, - VFS_OFFLOAD_WRITE_FL_MUST_CLONE - | VFS_OFFLOAD_WRITE_FL_IGNORE_LOCKS); + state->dup_extents.byte_count); if (tevent_req_nomem(subreq, req)) { return; } diff --git a/source3/smbd/smb2_ioctl_network_fs.c b/source3/smbd/smb2_ioctl_network_fs.c index 993f6f8d619..4006ccf3162 100644 --- a/source3/smbd/smb2_ioctl_network_fs.c +++ b/source3/smbd/smb2_ioctl_network_fs.c @@ -200,8 +200,7 @@ static NTSTATUS fsctl_srv_copychunk_loop(struct tevent_req *req) source_off, state->dst_fsp, target_off, - length, - 0); + length); if (tevent_req_nomem(subreq, req)) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index c82496b94a4..67b79ef621b 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -2382,14 +2382,12 @@ struct tevent_req *smb_vfs_call_offload_write_send(struct vfs_handle_struct *han off_t transfer_offset, struct files_struct *dest_fsp, off_t dest_off, - off_t num, - uint32_t flags) + off_t num) { VFS_FIND(offload_write_send); return handle->fns->offload_write_send_fn(handle, mem_ctx, ev, fsctl, token, transfer_offset, - dest_fsp, dest_off, num, - flags); + dest_fsp, dest_off, num); } NTSTATUS smb_vfs_call_offload_write_recv(struct vfs_handle_struct *handle, |