diff options
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/smbprofile.h | 1 | ||||
-rw-r--r-- | source3/include/vfs.h | 8 | ||||
-rw-r--r-- | source3/include/vfs_macros.h | 5 |
3 files changed, 2 insertions, 12 deletions
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index ea2a29a0758..41621c4e862 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -49,7 +49,6 @@ struct tevent_context; SMBPROFILE_STATS_BASIC(syscall_telldir) \ SMBPROFILE_STATS_BASIC(syscall_rewinddir) \ SMBPROFILE_STATS_BASIC(syscall_mkdirat) \ - SMBPROFILE_STATS_BASIC(syscall_rmdir) \ SMBPROFILE_STATS_BASIC(syscall_closedir) \ SMBPROFILE_STATS_BASIC(syscall_open) \ SMBPROFILE_STATS_BASIC(syscall_createfile) \ diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 326687f5ee1..5ea4f805817 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -283,6 +283,8 @@ /* Version 42 - Move [un]become_user*() -> [un]become_user_without_service*() */ /* Version 42 - Move SMB_VFS_UNLINK -> SMB_VFS_UNLINKAT. */ /* Version 42 - Add SMB_VFS_FCNTL */ +/* Version 42 - Remove SMB_VFS_RMDIR. + Use SMB_VFS_UNLINKAT(.., AT_REMOVEDIR) instead. */ #define SMB_VFS_INTERFACE_VERSION 42 @@ -716,8 +718,6 @@ struct vfs_fn_pointers { struct files_struct *dirfsp, const struct smb_filename *smb_fname, mode_t mode); - int (*rmdir_fn)(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname); int (*closedir_fn)(struct vfs_handle_struct *handle, DIR *dir); /* File operations */ @@ -1228,8 +1228,6 @@ int smb_vfs_call_mkdirat(struct vfs_handle_struct *handle, struct files_struct *dirfsp, const struct smb_filename *smb_fname, mode_t mode); -int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname); int smb_vfs_call_closedir(struct vfs_handle_struct *handle, DIR *dir); int smb_vfs_call_open(struct vfs_handle_struct *handle, @@ -1680,8 +1678,6 @@ int vfs_not_implemented_mkdirat(vfs_handle_struct *handle, struct files_struct *dirfsp, const struct smb_filename *smb_fname, mode_t mode); -int vfs_not_implemented_rmdir(vfs_handle_struct *handle, - const struct smb_filename *smb_fname); int vfs_not_implemented_closedir(vfs_handle_struct *handle, DIR *dir); int vfs_not_implemented_open(vfs_handle_struct *handle, struct smb_filename *smb_fname, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 2dd59711e19..95cf4cf3088 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -114,11 +114,6 @@ #define SMB_VFS_NEXT_MKDIRAT(handle, dirfsp, smb_fname, mode) \ smb_vfs_call_mkdirat((handle)->next,(dirfsp), (smb_fname), (mode)) -#define SMB_VFS_RMDIR(conn, smb_fname) \ - smb_vfs_call_rmdir((conn)->vfs_handles, (smb_fname)) -#define SMB_VFS_NEXT_RMDIR(handle, smb_fname) \ - smb_vfs_call_rmdir((handle)->next, (smb_fname)) - #define SMB_VFS_CLOSEDIR(conn, dir) \ smb_vfs_call_closedir((conn)->vfs_handles, dir) #define SMB_VFS_NEXT_CLOSEDIR(handle, dir) \ |