diff options
author | Andrew Bartlett <abartlet@samba.org> | 2012-04-04 08:26:22 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 13:39:00 +1000 |
commit | c5b17c555576a2b8e24e0df613dde922fe60520d (patch) | |
tree | c42c1041476e44c65f0304cc515c0d8212bf3fd1 /source3/include | |
parent | b2f7cfa848def91b6ea458e1ad14af8e96ad4ca3 (diff) | |
download | samba-c5b17c555576a2b8e24e0df613dde922fe60520d.tar.gz samba-c5b17c555576a2b8e24e0df613dde922fe60520d.tar.bz2 samba-c5b17c555576a2b8e24e0df613dde922fe60520d.zip |
s3-vfs: Remove unused llistxattr call from VFS modules, system.c and configure
If this is ever needed again, it would be more appropriate as an options argument
to listxattr.
Andrew Bartlett
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/proto.h | 1 | ||||
-rw-r--r-- | source3/include/vfs.h | 2 | ||||
-rw-r--r-- | source3/include/vfs_macros.h | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 2872ada33d..5bfd05cb53 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -353,7 +353,6 @@ int sys_pclose(int fd); ssize_t sys_getxattr (const char *path, const char *name, void *value, size_t size); 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_llistxattr (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); diff --git a/source3/include/vfs.h b/source3/include/vfs.h index d1aa9e96dc..258bec9275 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -138,6 +138,7 @@ /* Bump to version 29 - Samba 3.6.0 will ship with interface version 28. */ /* Leave at 29 - not yet releases. Add fsctl. Richard Sharpe */ /* Leave at 29 - not yet released. add SMB_VFS_GET_DFS_REFERRAL() - metze */ +/* Leave at 29 - not yet released. Remove llistxattr and lgetxattr - abartlet */ #define SMB_VFS_INTERFACE_VERSION 29 /* @@ -400,7 +401,6 @@ struct vfs_fn_pointers { ssize_t (*getxattr_fn)(struct vfs_handle_struct *handle,const char *path, const char *name, void *value, size_t size); ssize_t (*fgetxattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, void *value, size_t size); ssize_t (*listxattr_fn)(struct vfs_handle_struct *handle, const char *path, char *list, size_t size); - ssize_t (*llistxattr_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); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index e35630a629..6af662c1f4 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -529,11 +529,6 @@ #define SMB_VFS_NEXT_LISTXATTR(handle,path,list,size) \ smb_vfs_call_listxattr((handle)->next,(path),(list),(size)) -#define SMB_VFS_LLISTXATTR(conn,path,list,size) \ - smb_vfs_call_llistxattr((conn)->vfs_handles,(path),(list),(size)) -#define SMB_VFS_NEXT_LLISTXATTR(handle,path,list,size) \ - smb_vfs_call_llistxattr((handle)->next,(path),(list),(size)) - #define SMB_VFS_FLISTXATTR(fsp,list,size) \ smb_vfs_call_flistxattr((fsp)->conn->vfs_handles, (fsp), (list),(size)) #define SMB_VFS_NEXT_FLISTXATTR(handle,fsp,list,size) \ |