diff options
author | Jeremy Allison <jra@samba.org> | 2019-08-09 16:28:32 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2019-08-16 19:52:37 +0000 |
commit | 6acf4c35b46e8e7860209be00b688c631f0155bf (patch) | |
tree | f20272d40e14b01cc07968fe1d774960344e7b7d /source3/include | |
parent | f0ac39d56156257275048a55f101665e32905da9 (diff) | |
download | samba-6acf4c35b46e8e7860209be00b688c631f0155bf.tar.gz |
s3: VFS: Complete the replacement of SMB_VFS_RENAME() -> SMB_VFS_RENAMEAT().
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/smbprofile.h | 1 | ||||
-rw-r--r-- | source3/include/vfs.h | 11 | ||||
-rw-r--r-- | source3/include/vfs_macros.h | 5 |
3 files changed, 1 insertions, 16 deletions
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index 44335070b3c..c479c76d508 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -61,7 +61,6 @@ struct tevent_context; SMBPROFILE_STATS_BASIC(syscall_lseek) \ SMBPROFILE_STATS_BYTES(syscall_sendfile) \ SMBPROFILE_STATS_BYTES(syscall_recvfile) \ - SMBPROFILE_STATS_BASIC(syscall_rename) \ SMBPROFILE_STATS_BASIC(syscall_renameat) \ SMBPROFILE_STATS_BYTES(syscall_asys_fsync) \ SMBPROFILE_STATS_BASIC(syscall_stat) \ diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 2111173a772..dc407772079 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -272,7 +272,7 @@ /* Bump to version 42, Samba 4.12 will ship with that */ /* Version 42 - Remove share_access member from struct files_struct */ /* Version 42 - Make "lease" a const* in create_file_fn */ -/* Version 42 - Add SMB_VFS_RENAMEAT. */ +/* Version 42 - Move SMB_VFS_RENAME -> SMB_VFS_RENAMEAT */ #define SMB_VFS_INTERFACE_VERSION 42 @@ -745,9 +745,6 @@ struct vfs_fn_pointers { off_t (*lseek_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, off_t offset, int whence); ssize_t (*sendfile_fn)(struct vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *header, off_t offset, size_t count); ssize_t (*recvfile_fn)(struct vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t count); - int (*rename_fn)(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname_src, - const struct smb_filename *smb_fname_dst); int (*renameat_fn)(struct vfs_handle_struct *handle, struct files_struct *srcdir_fsp, const struct smb_filename *smb_fname_src, @@ -1260,9 +1257,6 @@ ssize_t smb_vfs_call_sendfile(struct vfs_handle_struct *handle, int tofd, ssize_t smb_vfs_call_recvfile(struct vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t count); -int smb_vfs_call_rename(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname_src, - const struct smb_filename *smb_fname_dst); int smb_vfs_call_renameat(struct vfs_handle_struct *handle, struct files_struct *srcfsp, const struct smb_filename *smb_fname_src, @@ -1696,9 +1690,6 @@ ssize_t vfs_not_implemented_sendfile(vfs_handle_struct *handle, int tofd, off_t offset, size_t n); ssize_t vfs_not_implemented_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t n); -int vfs_not_implemented_rename(vfs_handle_struct *handle, - const struct smb_filename *smb_fname_src, - const struct smb_filename *smb_fname_dst); int vfs_not_implemented_renameat(vfs_handle_struct *handle, files_struct *srcfsp, const struct smb_filename *smb_fname_src, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index d124b928f44..7bbdc97a6c6 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -185,11 +185,6 @@ #define SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, count) \ smb_vfs_call_recvfile((handle)->next, (fromfd), (tofsp), (offset), (count)) -#define SMB_VFS_RENAME(conn, old, new) \ - smb_vfs_call_rename((conn)->vfs_handles, (old), (new)) -#define SMB_VFS_NEXT_RENAME(handle, old, new) \ - smb_vfs_call_rename((handle)->next, (old), (new)) - #define SMB_VFS_RENAMEAT(conn, oldfsp, old, newfsp, new) \ smb_vfs_call_renameat((conn)->vfs_handles, (oldfsp), (old), (newfsp), (new)) #define SMB_VFS_NEXT_RENAMEAT(handle, oldfsp, old, newfsp, new) \ |