VFS: Remove SMB_VFS_REMOVEXATTR, no longer used

                                       ---------------
                                      /               \
                                     /      REST       \
                                    /        IN         \
                                   /        PEACE        \
                                  /                       \
                                  |                       |
                                  |  SMB_VFS_REMOVEXATTR  |
                                  |                       |
                                  |                       |
                                  |       22 March        |
                                  |         2021          |
                                  |                       |
                                  |                       |
                                 *|     *  *  *           | *
                        _________)/\\_//(\/(/\)/\//\/\////|_)_______

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 92ae46f7f5a8c9bb5a2f0a7ffc3deb82b2a50993..b58cfaffd22daa0c1cc4d3a904aa1cf5d3c4869b 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -933,14 +933,6 @@ static ssize_t skel_flistxattr(vfs_handle_struct *handle,
        return -1;
 }
 
-static int skel_removexattr(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       const char *name)
-{
-       errno = ENOSYS;
-       return -1;
-}
-
 static int skel_fremovexattr(vfs_handle_struct *handle,
                             struct files_struct *fsp, const char *name)
 {
@@ -1120,7 +1112,6 @@ static struct vfs_fn_pointers skel_opaque_fns = {
        .getxattrat_recv_fn = skel_getxattrat_recv,
        .fgetxattr_fn = skel_fgetxattr,
        .flistxattr_fn = skel_flistxattr,
-       .removexattr_fn = skel_removexattr,
        .fremovexattr_fn = skel_fremovexattr,
        .fsetxattr_fn = skel_fsetxattr,
 

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 93e5626f8acd218063007cac7f1c50baa477e204..2a92cadd4e2faf95a24474c1ca6cde03ecd198b1 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -1226,13 +1226,6 @@ static ssize_t skel_flistxattr(vfs_handle_struct *handle,
        return SMB_VFS_NEXT_FLISTXATTR(handle, fsp, list, size);
 }
 
-static int skel_removexattr(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       const char *name)
-{
-       return SMB_VFS_NEXT_REMOVEXATTR(handle, smb_fname, name);
-}
-
 static int skel_fremovexattr(vfs_handle_struct *handle,
                             struct files_struct *fsp, const char *name)
 {
@@ -1426,7 +1419,6 @@ static struct vfs_fn_pointers skel_transparent_fns = {
        .getxattrat_recv_fn = skel_getxattrat_recv,
        .fgetxattr_fn = skel_fgetxattr,
        .flistxattr_fn = skel_flistxattr,
-       .removexattr_fn = skel_removexattr,
        .fremovexattr_fn = skel_fremovexattr,
        .fsetxattr_fn = skel_fsetxattr,
 

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 96477f27e890610030f454f1617e252969cf952d..678db0b861fbbe3384914f51046693c78b1f9da0 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -345,6 +345,7 @@
  * Change to Version 45 - will ship with 4.15
  * Version 45 - Remove SMB_VFS_LISTXATTR
  * Version 45 - Remove SMB_VFS_SETXATTR
+ * Version 45 - Remove SMB_VFS_REMOVEXATTR
  */
 
 #define SMB_VFS_INTERFACE_VERSION 45
@@ -1248,9 +1249,6 @@ struct vfs_fn_pointers {
                                      uint8_t **xattr_value);
        ssize_t (*fgetxattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, void *value, size_t size);
        ssize_t (*flistxattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size);
-       int (*removexattr_fn)(struct vfs_handle_struct *handle,
-                                       const struct smb_filename *smb_fname,
-                                       const char *name);
        int (*fremovexattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name);
        int (*fsetxattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags);
 
@@ -1765,9 +1763,6 @@ ssize_t smb_vfs_call_fgetxattr(struct vfs_handle_struct *handle,
 ssize_t smb_vfs_call_flistxattr(struct vfs_handle_struct *handle,
                                struct files_struct *fsp, char *list,
                                size_t size);
-int smb_vfs_call_removexattr(struct vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname,
-                               const char *name);
 int smb_vfs_call_fremovexattr(struct vfs_handle_struct *handle,
                              struct files_struct *fsp, const char *name);
 int smb_vfs_call_lsetxattr(struct vfs_handle_struct *handle, const char *path,
@@ -2177,9 +2172,6 @@ ssize_t vfs_not_implemented_listxattr(vfs_handle_struct *handle,
 ssize_t vfs_not_implemented_flistxattr(vfs_handle_struct *handle,
                                       struct files_struct *fsp, char *list,
                                       size_t size);
-int vfs_not_implemented_removexattr(vfs_handle_struct *handle,
-                                   const struct smb_filename *smb_fname,
-                                   const char *name);
 int vfs_not_implemented_fremovexattr(vfs_handle_struct *handle,
                                     struct files_struct *fsp, const char *name);
 int vfs_not_implemented_setxattr(vfs_handle_struct *handle,

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index dab0c306a68befe82283fe242a72980a8c2067ac..fe26c8fa34786450112b9a310cdf7afef52b5783 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -551,11 +551,6 @@
 #define SMB_VFS_NEXT_FLISTXATTR(handle,fsp,list,size) \
        smb_vfs_call_flistxattr((handle)->next,(fsp),(list),(size))
 
-#define SMB_VFS_REMOVEXATTR(conn,smb_fname,name) \
-       smb_vfs_call_removexattr((conn)->vfs_handles,(smb_fname),(name))
-#define SMB_VFS_NEXT_REMOVEXATTR(handle,smb_fname,name) \
-       smb_vfs_call_removexattr((handle)->next,(smb_fname),(name))
-
 #define SMB_VFS_FREMOVEXATTR(fsp,name) \
        smb_vfs_call_fremovexattr((fsp)->conn->vfs_handles, (fsp), (name))
 #define SMB_VFS_NEXT_FREMOVEXATTR(handle,fsp,name) \

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 9a2c13d743b07504f570fbc71e80fc1ac634aa87..a3557fe2d14fd73e1071e0b09b9c01a44ce4ec74 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -3636,13 +3636,6 @@ static ssize_t vfswrap_flistxattr(struct vfs_handle_struct *handle, struct files
        return listxattr(fsp->fsp_name->base_name, list, size);
 }
 
-static int vfswrap_removexattr(struct vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname,
-                               const char *name)
-{
-       return removexattr(smb_fname->base_name, name);
-}
-
 static int vfswrap_fremovexattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name)
 {
        int fd = fsp_get_pathref_fd(fsp);
@@ -3877,7 +3870,6 @@ static struct vfs_fn_pointers vfs_default_fns = {
        .getxattrat_recv_fn = vfswrap_getxattrat_recv,
        .fgetxattr_fn = vfswrap_fgetxattr,
        .flistxattr_fn = vfswrap_flistxattr,
-       .removexattr_fn = vfswrap_removexattr,
        .fremovexattr_fn = vfswrap_fremovexattr,
        .fsetxattr_fn = vfswrap_fsetxattr,
 

diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c
index 52dd75f982976827eb08d7ddbd8f3b78e8890e7a..2b4e534dffb7386679cc6f78f3b7b6939f772bf9 100644 (file)
--- a/source3/modules/vfs_not_implemented.c
+++ b/source3/modules/vfs_not_implemented.c
@@ -937,14 +937,6 @@ ssize_t vfs_not_implemented_flistxattr(vfs_handle_struct *handle,
        return -1;
 }
 
-int vfs_not_implemented_removexattr(vfs_handle_struct *handle,
-                                   const struct smb_filename *smb_fname,
-                                   const char *name)
-{
-       errno = ENOSYS;
-       return -1;
-}
-
 int vfs_not_implemented_fremovexattr(vfs_handle_struct *handle,
                                     struct files_struct *fsp, const char *name)
 {
@@ -1124,7 +1116,6 @@ static struct vfs_fn_pointers vfs_not_implemented_fns = {
        .getxattrat_recv_fn = vfs_not_implemented_getxattrat_recv,
        .fgetxattr_fn = vfs_not_implemented_fgetxattr,
        .flistxattr_fn = vfs_not_implemented_flistxattr,
-       .removexattr_fn = vfs_not_implemented_removexattr,
        .fremovexattr_fn = vfs_not_implemented_fremovexattr,
        .fsetxattr_fn = vfs_not_implemented_fsetxattr,
 

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index c966135d27dcba8c5d78325e02001438d15734c7..432f2119df05d23108861e11416f9efa05d687f5 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -2925,14 +2925,6 @@ ssize_t smb_vfs_call_flistxattr(struct vfs_handle_struct *handle,
        return handle->fns->flistxattr_fn(handle, fsp, list, size);
 }
 
-int smb_vfs_call_removexattr(struct vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname,
-                               const char *name)
-{
-       VFS_FIND(removexattr);
-       return handle->fns->removexattr_fn(handle, smb_fname, name);
-}
-
 int smb_vfs_call_fremovexattr(struct vfs_handle_struct *handle,
                              struct files_struct *fsp, const char *name)
 {