From 6a8bc6b549078a09276763f2196bf54c70d5de65 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 21 Aug 2019 14:49:05 -0700 Subject: [PATCH] s3: VFS: Complete the replacement of SMB_VFS_MKNOD() -> SMB_VFS_MKNODAT(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jeremy Allison Reviewed-by: Ralph Böhme Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Aug 22 19:17:07 UTC 2019 on sn-devel-184 --- examples/VFS/skel_opaque.c | 10 ---------- examples/VFS/skel_transparent.c | 9 --------- source3/include/smbprofile.h | 1 - source3/include/vfs.h | 14 +------------- source3/include/vfs_macros.h | 5 ----- source3/modules/vfs_default.c | 14 -------------- source3/modules/vfs_not_implemented.c | 10 ---------- source3/smbd/vfs.c | 9 --------- 8 files changed, 1 insertion(+), 71 deletions(-) diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index a47b98b9896..48d8e3df7f6 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -484,15 +484,6 @@ static int skel_linkat(vfs_handle_struct *handle, return -1; } -static int skel_mknod(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - mode_t mode, - SMB_DEV_T dev) -{ - errno = ENOSYS; - return -1; -} - static int skel_mknodat(vfs_handle_struct *handle, files_struct *dirfsp, const struct smb_filename *smb_fname, @@ -1100,7 +1091,6 @@ static struct vfs_fn_pointers skel_opaque_fns = { .symlink_fn = skel_symlink, .readlink_fn = skel_vfs_readlink, .linkat_fn = skel_linkat, - .mknod_fn = skel_mknod, .mknodat_fn = skel_mknodat, .realpath_fn = skel_realpath, .chflags_fn = skel_chflags, diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c index e5f6305be4d..ab43118ce37 100644 --- a/examples/VFS/skel_transparent.c +++ b/examples/VFS/skel_transparent.c @@ -586,14 +586,6 @@ static int skel_linkat(vfs_handle_struct *handle, flags); } -static int skel_mknod(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - mode_t mode, - SMB_DEV_T dev) -{ - return SMB_VFS_NEXT_MKNOD(handle, smb_fname, mode, dev); -} - static int skel_mknodat(vfs_handle_struct *handle, files_struct *dirfsp, const struct smb_filename *smb_fname, @@ -1374,7 +1366,6 @@ static struct vfs_fn_pointers skel_transparent_fns = { .symlink_fn = skel_symlink, .readlink_fn = skel_vfs_readlink, .linkat_fn = skel_linkat, - .mknod_fn = skel_mknod, .mknodat_fn = skel_mknodat, .realpath_fn = skel_realpath, .chflags_fn = skel_chflags, 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) \ diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 6f2f4ef4535..51928fd0b04 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2687,19 +2687,6 @@ static int vfswrap_linkat(vfs_handle_struct *handle, return result; } -static int vfswrap_mknod(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - mode_t mode, - SMB_DEV_T dev) -{ - int result; - - START_PROFILE(syscall_mknod); - result = sys_mknod(smb_fname->base_name, mode, dev); - END_PROFILE(syscall_mknod); - return result; -} - static int vfswrap_mknodat(vfs_handle_struct *handle, files_struct *dirfsp, const struct smb_filename *smb_fname, @@ -3501,7 +3488,6 @@ static struct vfs_fn_pointers vfs_default_fns = { .symlink_fn = vfswrap_symlink, .readlink_fn = vfswrap_readlink, .linkat_fn = vfswrap_linkat, - .mknod_fn = vfswrap_mknod, .mknodat_fn = vfswrap_mknodat, .realpath_fn = vfswrap_realpath, .chflags_fn = vfswrap_chflags, diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c index 7b604db0dd2..02d36ecbaa4 100644 --- a/source3/modules/vfs_not_implemented.c +++ b/source3/modules/vfs_not_implemented.c @@ -482,15 +482,6 @@ int vfs_not_implemented_linkat(vfs_handle_struct *handle, return -1; } -int vfs_not_implemented_mknod(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - mode_t mode, - SMB_DEV_T dev) -{ - errno = ENOSYS; - return -1; -} - int vfs_not_implemented_mknodat(vfs_handle_struct *handle, files_struct *dirfsp, const struct smb_filename *smb_fname, @@ -1104,7 +1095,6 @@ static struct vfs_fn_pointers vfs_not_implemented_fns = { .symlink_fn = vfs_not_implemented_symlink, .readlink_fn = vfs_not_implemented_vfs_readlink, .linkat_fn = vfs_not_implemented_linkat, - .mknod_fn = vfs_not_implemented_mknod, .mknodat_fn = vfs_not_implemented_mknodat, .realpath_fn = vfs_not_implemented_realpath, .chflags_fn = vfs_not_implemented_chflags, diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index 900890ace00..6f348da2fe8 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -2226,15 +2226,6 @@ int smb_vfs_call_linkat(struct vfs_handle_struct *handle, flags); } -int smb_vfs_call_mknod(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - mode_t mode, - SMB_DEV_T dev) -{ - VFS_FIND(mknod); - return handle->fns->mknod_fn(handle, smb_fname, mode, dev); -} - int smb_vfs_call_mknodat(struct vfs_handle_struct *handle, struct files_struct *dirfsp, const struct smb_filename *smb_fname, -- 2.34.1