diff options
| author | Jeremy Allison <jra@samba.org> | 2018-05-02 16:56:33 -0700 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2018-05-05 01:38:07 +0200 |
| commit | 30e6b5999bf0be297de74dc991beeccfe4af6088 (patch) | |
| tree | 50ed5af4a16aca9e52df4a82e3d1c8063327189c /source3/include | |
| parent | 98f03064f75466929295b8854182977c7162e360 (diff) | |
| download | samba-30e6b5999bf0be297de74dc991beeccfe4af6088.tar.gz | |
s3: VFS: Remove SMB_VFS_WRITE() function and all implementations.
All code in Samba now uses SMB_VFS_PWRITE or SMB_VFS_PWRITE_SEND.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Sat May 5 01:38:07 CEST 2018 on sn-devel-144
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 6 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 74029a9edab..cc7948a115d 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -249,6 +249,8 @@ Only implement async versions. */ /* Version 39 - Remove SMB_VFS_READ All users are now pread or async versions. */ +/* Version 39 - Remove SMB_VFS_WRITE + All users are now pwrite or async versions. */ #define SMB_VFS_INTERFACE_VERSION 39 @@ -695,7 +697,6 @@ struct vfs_fn_pointers { void *data, size_t n, off_t offset); ssize_t (*pread_recv_fn)(struct tevent_req *req, struct vfs_aio_state *state); - ssize_t (*write_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n); ssize_t (*pwrite_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, off_t offset); struct tevent_req *(*pwrite_send_fn)(struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx, @@ -1182,9 +1183,6 @@ struct tevent_req *smb_vfs_call_pread_send(struct vfs_handle_struct *handle, size_t n, off_t offset); ssize_t SMB_VFS_PREAD_RECV(struct tevent_req *req, struct vfs_aio_state *state); -ssize_t smb_vfs_call_write(struct vfs_handle_struct *handle, - struct files_struct *fsp, const void *data, - size_t n); ssize_t smb_vfs_call_pwrite(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, off_t offset); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 5e30f0b484a..d4836134697 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -158,11 +158,6 @@ smb_vfs_call_pread_send((handle)->next, (mem_ctx), (ev), (fsp), \ (data), (n), (off)) -#define SMB_VFS_WRITE(fsp, data, n) \ - smb_vfs_call_write((fsp)->conn->vfs_handles, (fsp), (data), (n)) -#define SMB_VFS_NEXT_WRITE(handle, fsp, data, n) \ - smb_vfs_call_write((handle)->next, (fsp), (data), (n)) - #define SMB_VFS_PWRITE(fsp, data, n, off) \ smb_vfs_call_pwrite((fsp)->conn->vfs_handles, (fsp), (data), (n), (off)) #define SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, off) \ |