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/include/proto.h | 1 - source3/include/vfs.h | 3 --- source3/include/vfs_macros.h | 5 ----- 3 files changed, 9 deletions(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index b4b91e2b18..1d3dba6a83 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -355,7 +355,6 @@ ssize_t sys_fgetxattr (int filedes, const char *name, void *value, size_t size); ssize_t sys_listxattr (const char *path, char *list, size_t size); ssize_t sys_flistxattr (int filedes, char *list, size_t size); int sys_removexattr (const char *path, const char *name); -int sys_lremovexattr (const char *path, const char *name); int sys_fremovexattr (int filedes, const char *name); int sys_setxattr (const char *path, const char *name, const void *value, size_t size, int flags); int sys_fsetxattr (int filedes, const char *name, const void *value, size_t size, int flags); diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 0e42a3e812..48b0973fe5 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -403,7 +403,6 @@ struct vfs_fn_pointers { ssize_t (*listxattr_fn)(struct vfs_handle_struct *handle, const char *path, char *list, 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 char *path, const char *name); - int (*lremovexattr_fn)(struct vfs_handle_struct *handle, const char *path, const char *name); int (*fremovexattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name); int (*setxattr_fn)(struct vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags); int (*fsetxattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags); @@ -815,8 +814,6 @@ ssize_t smb_vfs_call_flistxattr(struct vfs_handle_struct *handle, size_t size); int smb_vfs_call_removexattr(struct vfs_handle_struct *handle, const char *path, const char *name); -int smb_vfs_call_lremovexattr(struct vfs_handle_struct *handle, - const char *path, const char *name); int smb_vfs_call_fremovexattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name); int smb_vfs_call_setxattr(struct vfs_handle_struct *handle, const char *path, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index e568ed0f49..c324439e3f 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -539,11 +539,6 @@ #define SMB_VFS_NEXT_REMOVEXATTR(handle,path,name) \ smb_vfs_call_removexattr((handle)->next,(path),(name)) -#define SMB_VFS_LREMOVEXATTR(conn,path,name) \ - smb_vfs_call_lremovexattr((conn)->vfs_handles,(path),(name)) -#define SMB_VFS_NEXT_LREMOVEXATTR(handle,path,name) \ - smb_vfs_call_lremovexattr((handle)->next,(path),(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) \ -- cgit