From 19eee33d82b4c1947b646241b6f22651abbce19d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 4 Apr 2012 08:46:25 +1000 Subject: s3-vfs: Remove unused lremovexattr call from VFS modules, system.c and configure If this is ever needed again, it would be more appropriate as an options argument to removexattr. Andrew Bartlett --- source3/modules/vfs_cap.c | 13 ------------- source3/modules/vfs_catia.c | 23 ----------------------- source3/modules/vfs_default.c | 6 ------ source3/modules/vfs_full_audit.c | 17 ----------------- source3/modules/vfs_onefs_shadow_copy.c | 10 ---------- source3/modules/vfs_shadow_copy2.c | 28 ---------------------------- source3/modules/vfs_time_audit.c | 20 -------------------- 7 files changed, 117 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 406126cade..2454e12b6f 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -488,18 +488,6 @@ static int cap_removexattr(vfs_handle_struct *handle, const char *path, const ch return SMB_VFS_NEXT_REMOVEXATTR(handle, cappath, capname); } -static int cap_lremovexattr(vfs_handle_struct *handle, const char *path, const char *name) -{ - char *cappath = capencode(talloc_tos(), path); - char *capname = capencode(talloc_tos(), name); - - if (!cappath || !capname) { - errno = ENOMEM; - return -1; - } - return SMB_VFS_NEXT_LREMOVEXATTR(handle, cappath, capname); -} - static int cap_fremovexattr(vfs_handle_struct *handle, struct files_struct *fsp, const char *path) { char *cappath = capencode(talloc_tos(), path); @@ -563,7 +551,6 @@ static struct vfs_fn_pointers vfs_cap_fns = { .fgetxattr_fn = cap_fgetxattr, .listxattr_fn = cap_listxattr, .removexattr_fn = cap_removexattr, - .lremovexattr_fn = cap_lremovexattr, .fremovexattr_fn = cap_fremovexattr, .setxattr_fn = cap_setxattr, .fsetxattr_fn = cap_fsetxattr diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index 6979dc6c8d..821a755e06 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -874,28 +874,6 @@ catia_removexattr(vfs_handle_struct *handle, const char *path, return ret; } -static int -catia_lremovexattr(vfs_handle_struct *handle, const char *path, - const char *name) -{ - char *mapped_name = NULL; - NTSTATUS status; - ssize_t ret; - - status = catia_string_replace_allocate(handle->conn, - name, &mapped_name, vfs_translate_to_unix); - if (!NT_STATUS_IS_OK(status)) { - errno = map_errno_from_nt_status(status); - return -1; - } - - - ret = SMB_VFS_NEXT_LREMOVEXATTR(handle, path, mapped_name); - TALLOC_FREE(mapped_name); - - return ret; -} - static int catia_setxattr(vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, @@ -944,7 +922,6 @@ static struct vfs_fn_pointers vfs_catia_fns = { .getxattr_fn = catia_getxattr, .listxattr_fn = catia_listxattr, .removexattr_fn = catia_removexattr, - .lremovexattr_fn = catia_lremovexattr, .setxattr_fn = catia_setxattr, }; diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 08ad80f8d3..9704f5edbb 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2028,11 +2028,6 @@ static int vfswrap_removexattr(struct vfs_handle_struct *handle, const char *pat return sys_removexattr(path, name); } -static int vfswrap_lremovexattr(struct vfs_handle_struct *handle, const char *path, const char *name) -{ - return sys_lremovexattr(path, name); -} - static int vfswrap_fremovexattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name) { return sys_fremovexattr(fsp->fh->fd, name); @@ -2268,7 +2263,6 @@ static struct vfs_fn_pointers vfs_default_fns = { .listxattr_fn = vfswrap_listxattr, .flistxattr_fn = vfswrap_flistxattr, .removexattr_fn = vfswrap_removexattr, - .lremovexattr_fn = vfswrap_lremovexattr, .fremovexattr_fn = vfswrap_fremovexattr, .setxattr_fn = vfswrap_setxattr, .fsetxattr_fn = vfswrap_fsetxattr, diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 73e41ed265..4457860d2e 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -195,7 +195,6 @@ typedef enum _vfs_op_type { SMB_VFS_OP_LISTXATTR, SMB_VFS_OP_FLISTXATTR, SMB_VFS_OP_REMOVEXATTR, - SMB_VFS_OP_LREMOVEXATTR, SMB_VFS_OP_FREMOVEXATTR, SMB_VFS_OP_SETXATTR, SMB_VFS_OP_FSETXATTR, @@ -323,7 +322,6 @@ static struct { { SMB_VFS_OP_LISTXATTR, "listxattr" }, { SMB_VFS_OP_FLISTXATTR, "flistxattr" }, { SMB_VFS_OP_REMOVEXATTR, "removexattr" }, - { SMB_VFS_OP_LREMOVEXATTR, "lremovexattr" }, { SMB_VFS_OP_FREMOVEXATTR, "fremovexattr" }, { SMB_VFS_OP_SETXATTR, "setxattr" }, { SMB_VFS_OP_FSETXATTR, "fsetxattr" }, @@ -2022,20 +2020,6 @@ static int smb_full_audit_removexattr(struct vfs_handle_struct *handle, return result; } -static int smb_full_audit_lremovexattr(struct vfs_handle_struct *handle, - const char *path, - const char *name) -{ - int result; - - result = SMB_VFS_NEXT_LREMOVEXATTR(handle, path, name); - - do_log(SMB_VFS_OP_LREMOVEXATTR, (result >= 0), handle, - "%s|%s", path, name); - - return result; -} - static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name) @@ -2294,7 +2278,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = { .listxattr_fn = smb_full_audit_listxattr, .flistxattr_fn = smb_full_audit_flistxattr, .removexattr_fn = smb_full_audit_removexattr, - .lremovexattr_fn = smb_full_audit_lremovexattr, .fremovexattr_fn = smb_full_audit_fremovexattr, .setxattr_fn = smb_full_audit_setxattr, .fsetxattr_fn = smb_full_audit_fsetxattr, diff --git a/source3/modules/vfs_onefs_shadow_copy.c b/source3/modules/vfs_onefs_shadow_copy.c index 531f9b4b83..ac61852d3d 100644 --- a/source3/modules/vfs_onefs_shadow_copy.c +++ b/source3/modules/vfs_onefs_shadow_copy.c @@ -586,15 +586,6 @@ onefs_shadow_copy_removexattr(vfs_handle_struct *handle, const char *path, int); } -static int -onefs_shadow_copy_lremovexattr(vfs_handle_struct *handle, const char *path, - const char *name) -{ - SHADOW_NEXT(LREMOVEXATTR, - (handle, cpath ?: path, name), - int); -} - static int onefs_shadow_copy_setxattr(vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, @@ -663,7 +654,6 @@ static struct vfs_fn_pointers onefs_shadow_copy_fns = { .getxattr_fn = onefs_shadow_copy_getxattr, .listxattr_fn = onefs_shadow_copy_listxattr, .removexattr_fn = onefs_shadow_copy_removexattr, - .lremovexattr_fn = onefs_shadow_copy_lremovexattr, .setxattr_fn = onefs_shadow_copy_setxattr, .lsetxattr_fn = onefs_shadow_copy_lsetxattr, .is_offline_fn = onefs_shadow_copy_is_offline, diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c index 544baa44f7..24356ece1f 100644 --- a/source3/modules/vfs_shadow_copy2.c +++ b/source3/modules/vfs_shadow_copy2.c @@ -1377,33 +1377,6 @@ static int shadow_copy2_removexattr(vfs_handle_struct *handle, return ret; } -static int shadow_copy2_lremovexattr(vfs_handle_struct *handle, - const char *fname, const char *aname) -{ - time_t timestamp; - char *stripped; - int ret, saved_errno; - char *conv; - - if (!shadow_copy2_strip_snapshot(talloc_tos(), handle, fname, - ×tamp, &stripped)) { - return -1; - } - if (timestamp == 0) { - return SMB_VFS_NEXT_LREMOVEXATTR(handle, fname, aname); - } - conv = shadow_copy2_convert(talloc_tos(), handle, stripped, timestamp); - TALLOC_FREE(stripped); - if (conv == NULL) { - return -1; - } - ret = SMB_VFS_NEXT_LREMOVEXATTR(handle, conv, aname); - saved_errno = errno; - TALLOC_FREE(conv); - errno = saved_errno; - return ret; -} - static int shadow_copy2_setxattr(struct vfs_handle_struct *handle, const char *fname, const char *aname, const void *value, @@ -1530,7 +1503,6 @@ static struct vfs_fn_pointers vfs_shadow_copy2_fns = { .getxattr_fn = shadow_copy2_getxattr, .listxattr_fn = shadow_copy2_listxattr, .removexattr_fn = shadow_copy2_removexattr, - .lremovexattr_fn = shadow_copy2_lremovexattr, .setxattr_fn = shadow_copy2_setxattr, .chmod_acl_fn = shadow_copy2_chmod_acl, .chflags_fn = shadow_copy2_chflags, diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index 747fc79bd2..ac96893cc4 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -2032,25 +2032,6 @@ static int smb_time_audit_removexattr(struct vfs_handle_struct *handle, return result; } -static int smb_time_audit_lremovexattr(struct vfs_handle_struct *handle, - const char *path, const char *name) -{ - int result; - struct timespec ts1,ts2; - double timediff; - - clock_gettime_mono(&ts1); - result = SMB_VFS_NEXT_LREMOVEXATTR(handle, path, name); - clock_gettime_mono(&ts2); - timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9; - - if (timediff > audit_timeout) { - smb_time_audit_log("lremovexattr", timediff); - } - - return result; -} - static int smb_time_audit_fremovexattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name) @@ -2376,7 +2357,6 @@ static struct vfs_fn_pointers vfs_time_audit_fns = { .listxattr_fn = smb_time_audit_listxattr, .flistxattr_fn = smb_time_audit_flistxattr, .removexattr_fn = smb_time_audit_removexattr, - .lremovexattr_fn = smb_time_audit_lremovexattr, .fremovexattr_fn = smb_time_audit_fremovexattr, .setxattr_fn = smb_time_audit_setxattr, .fsetxattr_fn = smb_time_audit_fsetxattr, -- cgit