diff options
| author | Jeremy Allison <jra@samba.org> | 2019-08-21 14:49:05 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-08-22 19:17:07 +0000 |
| commit | 6a8bc6b549078a09276763f2196bf54c70d5de65 (patch) | |
| tree | 17ddadbd94814969edfb1f70ba7bcae308451f8f /source3/include | |
| parent | e37580f45a557ad9f23a7220bd8edae8e6ce7bd5 (diff) | |
| download | samba-6a8bc6b549078a09276763f2196bf54c70d5de65.tar.gz | |
s3: VFS: Complete the replacement of SMB_VFS_MKNOD() -> SMB_VFS_MKNODAT().
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Aug 22 19:17:07 UTC 2019 on sn-devel-184
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smbprofile.h | 1 | ||||
| -rw-r--r-- | source3/include/vfs.h | 14 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 5 |
3 files changed, 1 insertions, 19 deletions
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index 8344e8254e4..048ce8504cd 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -85,7 +85,6 @@ struct tevent_context; SMBPROFILE_STATS_BASIC(syscall_readlink) \ SMBPROFILE_STATS_BASIC(syscall_symlink) \ SMBPROFILE_STATS_BASIC(syscall_linkat) \ - SMBPROFILE_STATS_BASIC(syscall_mknod) \ SMBPROFILE_STATS_BASIC(syscall_mknodat) \ SMBPROFILE_STATS_BASIC(syscall_realpath) \ SMBPROFILE_STATS_BASIC(syscall_get_quota) \ diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 4f06d6e85dd..3463b574e5b 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -274,7 +274,7 @@ /* Version 42 - Make "lease" a const* in create_file_fn */ /* Version 42 - Move SMB_VFS_RENAME -> SMB_VFS_RENAMEAT */ /* Version 42 - Move SMB_VFS_LINK -> SMB_VFS_LINKAT. */ -/* Version 42 - Add SMB_VFS_MKDNODAT. */ +/* Version 42 - Move SMB_VFS_MKNOD -> SMB_VFS_MKDNODAT. */ #define SMB_VFS_INTERFACE_VERSION 42 @@ -807,10 +807,6 @@ struct vfs_fn_pointers { struct files_struct *dstfsp, const struct smb_filename *new_smb_fname, int flags); - int (*mknod_fn)(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - mode_t mode, - SMB_DEV_T dev); int (*mknodat_fn)(struct vfs_handle_struct *handle, struct files_struct *dirfsp, const struct smb_filename *smb_fname, @@ -1344,10 +1340,6 @@ int smb_vfs_call_linkat(struct vfs_handle_struct *handle, struct files_struct *dstfsp, const struct smb_filename *new_smb_fname, int flags); -int smb_vfs_call_mknod(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - mode_t mode, - SMB_DEV_T dev); int smb_vfs_call_mknodat(struct vfs_handle_struct *handle, struct files_struct *dirfsp, const struct smb_filename *smb_fname, @@ -1778,10 +1770,6 @@ int vfs_not_implemented_linkat(vfs_handle_struct *handle, struct files_struct *dstfsp, const struct smb_filename *new_smb_fname, int flags); -int vfs_not_implemented_mknod(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - mode_t mode, - SMB_DEV_T dev); int vfs_not_implemented_mknodat(vfs_handle_struct *handle, struct files_struct *dirfsp, const struct smb_filename *smb_fname, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 26102896604..0f317ecbe31 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -311,11 +311,6 @@ #define SMB_VFS_NEXT_LINKAT(handle, srcfsp, oldpath, dstfsp, newpath, flags) \ smb_vfs_call_linkat((handle)->next, (srcfsp), (oldpath), (dstfsp), (newpath), (flags)) -#define SMB_VFS_MKNOD(conn, smb_fname, mode, dev) \ - smb_vfs_call_mknod((conn)->vfs_handles, (smb_fname), (mode), (dev)) -#define SMB_VFS_NEXT_MKNOD(handle, smb_fname, mode, dev) \ - smb_vfs_call_mknod((handle)->next, (smb_fname), (mode), (dev)) - #define SMB_VFS_MKNODAT(conn, dirfsp, smb_fname, mode, dev) \ smb_vfs_call_mknodat((conn)->vfs_handles, (dirfsp), (smb_fname), (mode), (dev)) #define SMB_VFS_NEXT_MKNODAT(handle, dirfsp, smb_fname, mode, dev) \ |