remove <linux/xattr_acl.h>
Subsystems (4)
PATCH 1/1 remove <linux/xattr_acl.h>
This file duplicates <linux/posix_acl_xattr.h>, using slightly different names.
Signed-off-by Christoph Hellwig <[email protected]>
fs/ext3/acl.h +1 -1
@@ -4,7 +4,7 @@(C) 2001 Andreas Gruenbacher, <[email protected]> */ -#include <linux/xattr_acl.h> +#include <linux/posix_acl_xattr.h> #define EXT3_ACL_VERSION 0x0001
include/linux/reiserfs_acl.h +0 -1
@@ -1,6 +1,5 @@#include <linux/init.h> #include <linux/posix_acl.h> -#include <linux/xattr_acl.h> #define REISERFS_ACL_VERSION 0x0001
fs/nfsd/vfs.c +4 -5
@@ -49,7 +49,6 @@#ifdef CONFIG_NFSD_V4 #include <linux/posix_acl.h> #include <linux/posix_acl_xattr.h> -#include <linux/xattr_acl.h> #include <linux/xattr.h> #include <linux/nfs4.h> #include <linux/nfs4_acl.h>
@@ -424,13 +423,13 @@ goto out_nfserr;if (pacl) { - error =set_nfsv4_acl_one (dentry, pacl,XATTR_NAME_ACL_ACCESS ); + error =set_nfsv4_acl_one (dentry, pacl,POSIX_ACL_XATTR_ACCESS );if (error <0 ) goto out_nfserr; }if (dpacl) { - error =set_nfsv4_acl_one (dentry, dpacl,XATTR_NAME_ACL_DEFAULT ); + error =set_nfsv4_acl_one (dentry, dpacl,POSIX_ACL_XATTR_DEFAULT );if (error <0 ) goto out_nfserr; }
@@ -497,7 +496,7 @@struct posix_acl *pacl =NULL , *dpacl =NULL ;unsigned int flags =0 ; - pacl =_get_posix_acl (dentry,XATTR_NAME_ACL_ACCESS ); + pacl =_get_posix_acl (dentry,POSIX_ACL_XATTR_ACCESS );if (IS_ERR (pacl) &&PTR_ERR (pacl) == -ENODATA ) pacl =posix_acl_from_mode (inode->i_mode,GFP_KERNEL );if (IS_ERR (pacl)) {
@@ -507,7 +506,7 @@ }if (S_ISDIR (inode->i_mode)) { - dpacl =_get_posix_acl (dentry,XATTR_NAME_ACL_DEFAULT ); + dpacl =_get_posix_acl (dentry,POSIX_ACL_XATTR_DEFAULT );if (IS_ERR (dpacl) &&PTR_ERR (dpacl) == -ENODATA ) dpacl =NULL ;else if (IS_ERR (dpacl)) {
fs/reiserfs/xattr_acl.c +13 -13
@@ -4,7 +4,7 @@#include <linux/errno.h> #include <linux/pagemap.h> #include <linux/xattr.h> -#include <linux/xattr_acl.h> +#include <linux/posix_acl_xattr.h> #include <linux/reiserfs_xattr.h> #include <linux/reiserfs_acl.h> #include <asm/uaccess.h>
@@ -192,11 +192,11 @@switch (type) {case ACL_TYPE_ACCESS : - name =XATTR_NAME_ACL_ACCESS ; + name =POSIX_ACL_XATTR_ACCESS ; p_acl = &reiserfs_i->i_acl_access;break ;case ACL_TYPE_DEFAULT : - name =XATTR_NAME_ACL_DEFAULT ; + name =POSIX_ACL_XATTR_DEFAULT ; p_acl = &reiserfs_i->i_acl_default;break ;default :
@@ -260,7 +260,7 @@switch (type) {case ACL_TYPE_ACCESS : - name =XATTR_NAME_ACL_ACCESS ; + name =POSIX_ACL_XATTR_ACCESS ; p_acl = &reiserfs_i->i_acl_access;if (acl) {mode_t mode = inode->i_mode;
@@ -275,7 +275,7 @@ }break ;case ACL_TYPE_DEFAULT : - name =XATTR_NAME_ACL_DEFAULT ; + name =POSIX_ACL_XATTR_DEFAULT ; p_acl = &reiserfs_i->i_acl_default;if (!S_ISDIR (inode->i_mode))return acl ? -EACCES :0 ;
@@ -468,7 +468,7 @@ posix_acl_access_get(struct inode *inode, const char *name, void *buffer, size_t size) { - if (strlen(name) != sizeof(XATTR_NAME_ACL_ACCESS)-1) + if (strlen(name) != sizeof(POSIX_ACL_XATTR_ACCESS)-1)return -EINVAL ;return xattr_get_acl (inode,ACL_TYPE_ACCESS , buffer, size); }
@@ -477,7 +477,7 @@ posix_acl_access_set(struct inode *inode, const char *name, const void *value, size_t size, int flags) { - if (strlen(name) != sizeof(XATTR_NAME_ACL_ACCESS)-1) + if (strlen(name) != sizeof(POSIX_ACL_XATTR_ACCESS)-1)return -EINVAL ;return xattr_set_acl (inode,ACL_TYPE_ACCESS , value, size); }
@@ -487,7 +487,7 @@ {struct reiserfs_inode_info *reiserfs_i =REISERFS_I (inode);struct posix_acl **acl = &reiserfs_i->i_acl_access; -if (strlen (name) !=sizeof (XATTR_NAME_ACL_ACCESS )-1 ) +if (strlen (name) !=sizeof (POSIX_ACL_XATTR_ACCESS )-1 )return -EINVAL ;if (!IS_ERR (*acl) && *acl) {posix_acl_release (*acl);
@@ -510,7 +510,7 @@ }struct reiserfs_xattr_handler posix_acl_access_handler = { - .prefix =XATTR_NAME_ACL_ACCESS , + .prefix =POSIX_ACL_XATTR_ACCESS , .get = posix_acl_access_get, .set = posix_acl_access_set, .del = posix_acl_access_del,
@@ -521,7 +521,7 @@ posix_acl_default_get (struct inode *inode, const char *name, void *buffer, size_t size) { - if (strlen(name) != sizeof(XATTR_NAME_ACL_DEFAULT)-1) + if (strlen(name) != sizeof(POSIX_ACL_XATTR_DEFAULT)-1)return -EINVAL ;return xattr_get_acl (inode,ACL_TYPE_DEFAULT , buffer, size); }
@@ -530,7 +530,7 @@ posix_acl_default_set(struct inode *inode, const char *name, const void *value, size_t size, int flags) { - if (strlen(name) != sizeof(XATTR_NAME_ACL_DEFAULT)-1) + if (strlen(name) != sizeof(POSIX_ACL_XATTR_DEFAULT)-1)return -EINVAL ;return xattr_set_acl (inode,ACL_TYPE_DEFAULT , value, size); }
@@ -540,7 +540,7 @@ {struct reiserfs_inode_info *reiserfs_i =REISERFS_I (inode);struct posix_acl **acl = &reiserfs_i->i_acl_default; -if (strlen (name) !=sizeof (XATTR_NAME_ACL_DEFAULT )-1 ) +if (strlen (name) !=sizeof (POSIX_ACL_XATTR_DEFAULT )-1 )return -EINVAL ;if (!IS_ERR (*acl) && *acl) {posix_acl_release (*acl);
@@ -563,7 +563,7 @@ }struct reiserfs_xattr_handler posix_acl_default_handler = { - .prefix =XATTR_NAME_ACL_DEFAULT , + .prefix =POSIX_ACL_XATTR_DEFAULT , .get = posix_acl_default_get, .set = posix_acl_default_set, .del = posix_acl_default_del,
arch/ppc/boot/simple/mpc10x_memory.c +1 -1
@@ -33,7 +33,7 @@#define MPC10X_PCI_OP (rw, size, type, op, mask) \ static void \ -mpc10x_##rw##_config_##size(unsigned int *cfg_addr, \ +mpc10x_##rw##_config_##size(unsigned int __iomem *cfg_addr, \ unsigned int *cfg_data, int devfn, int offset, \ type val) \ { \
fs/ext2/acl.c +6 -6
@@ -396,12 +396,12 @@ ext2_xattr_list_acl_access(struct inode *inode, char *list, size_t list_size, const char *name, size_t name_len) { - const size_t size = sizeof(XATTR_NAME_ACL_ACCESS); + const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);if (!test_opt (inode->i_sb,POSIX_ACL ))return 0 ;if (list && size <= list_size) -memcpy (list,XATTR_NAME_ACL_ACCESS , size); +memcpy (list,POSIX_ACL_XATTR_ACCESS , size);return size; }
@@ -409,12 +409,12 @@ ext2_xattr_list_acl_default(struct inode *inode, char *list, size_t list_size, const char *name, size_t name_len) { - const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT); + const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);if (!test_opt (inode->i_sb,POSIX_ACL ))return 0 ;if (list && size <= list_size) -memcpy (list,XATTR_NAME_ACL_DEFAULT , size); +memcpy (list,POSIX_ACL_XATTR_DEFAULT , size);return size; }
@@ -506,14 +506,14 @@ }struct xattr_handler ext2_xattr_acl_access_handler = { - .prefix =XATTR_NAME_ACL_ACCESS , + .prefix =POSIX_ACL_XATTR_ACCESS , .list = ext2_xattr_list_acl_access, .get = ext2_xattr_get_acl_access, .set = ext2_xattr_set_acl_access, };struct xattr_handler ext2_xattr_acl_default_handler = { - .prefix =XATTR_NAME_ACL_DEFAULT , + .prefix =POSIX_ACL_XATTR_DEFAULT , .list = ext2_xattr_list_acl_default, .get = ext2_xattr_get_acl_default, .set = ext2_xattr_set_acl_default,
fs/jfs/super.c +1 -0
@@ -24,6 +24,7 @@#include <linux/completion.h> #include <linux/vfs.h> #include <linux/moduleparam.h> +#include <linux/posix_acl.h> #include <asm/uaccess.h> #include "jfs_incore.h"
fs/ext3/acl.c +6 -6
@@ -417,12 +417,12 @@ ext3_xattr_list_acl_access(struct inode *inode, char *list, size_t list_len, const char *name, size_t name_len) { - const size_t size = sizeof(XATTR_NAME_ACL_ACCESS); + const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);if (!test_opt (inode->i_sb,POSIX_ACL ))return 0 ;if (list && size <= list_len) -memcpy (list,XATTR_NAME_ACL_ACCESS , size); +memcpy (list,POSIX_ACL_XATTR_ACCESS , size);return size; }
@@ -430,12 +430,12 @@ ext3_xattr_list_acl_default(struct inode *inode, char *list, size_t list_len, const char *name, size_t name_len) { - const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT); + const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);if (!test_opt (inode->i_sb,POSIX_ACL ))return 0 ;if (list && size <= list_len) -memcpy (list,XATTR_NAME_ACL_DEFAULT , size); +memcpy (list,POSIX_ACL_XATTR_DEFAULT , size);return size; }
@@ -535,14 +535,14 @@ }struct xattr_handler ext3_xattr_acl_access_handler = { - .prefix =XATTR_NAME_ACL_ACCESS , + .prefix =POSIX_ACL_XATTR_ACCESS , .list = ext3_xattr_list_acl_access, .get = ext3_xattr_get_acl_access, .set = ext3_xattr_set_acl_access, };struct xattr_handler ext3_xattr_acl_default_handler = { - .prefix =XATTR_NAME_ACL_DEFAULT , + .prefix =POSIX_ACL_XATTR_DEFAULT , .list = ext3_xattr_list_acl_default, .get = ext3_xattr_get_acl_default, .set = ext3_xattr_set_acl_default,
include/linux/posix_acl_xattr.h +3 -0
@@ -52,4 +52,7 @@ return size / sizeof(posix_acl_xattr_entry); } +struct posix_acl *posix_acl_from_xattr (const void *value,size_t size); +int posix_acl_to_xattr (const struct posix_acl *acl,void *buffer,size_t size); +#endif /* _POSIX_ACL_XATTR_H */
fs/jfs/jfs_acl.h +0 -2
@@ -20,8 +20,6 @@#ifdef CONFIG_JFS_POSIX_ACL -#include <linux/xattr_acl.h> -int jfs_permission (struct inode *,int ,struct nameidata *);int jfs_init_acl (struct inode *,struct inode *);int jfs_setattr (struct dentry *,struct iattr *);
arch/ppc/boot/simple/misc.c +1 -1
@@ -222,7 +222,7 @@puts ("\n" );puts ("Uncompressing Linux..." ); -gunzip (0x0 ,0x400000 , zimage_start, &zimage_size); +gunzip (NULL ,0x400000 , zimage_start, &zimage_size);puts ("done.\n" );/* get the bi_rec address */
fs/ext2/acl.h +1 -1
@@ -4,7 +4,7 @@(C) 2001 Andreas Gruenbacher, <[email protected]> */ -#include <linux/xattr_acl.h> +#include <linux/posix_acl_xattr.h> #define EXT2_ACL_VERSION 0x0001
fs/jfs/xattr.c +4 -3
@@ -19,6 +19,7 @@#include <linux/fs.h> #include <linux/xattr.h> +#include <linux/posix_acl_xattr.h> #include <linux/quotaops.h> #include "jfs_incore.h" #include "jfs_superblock.h"
@@ -718,9 +719,9 @@return -EPERM ;/* -* XATTR_NAME_ACL_ACCESS is tied to i_mode +* POSIX_ACL_XATTR_ACCESS is tied to i_mode */ -if (strcmp (name,XATTR_NAME_ACL_ACCESS ) ==0 ) { +if (strcmp (name,POSIX_ACL_XATTR_ACCESS ) ==0 ) { acl =posix_acl_from_xattr (value, value_len);if (IS_ERR (acl)) { rc =PTR_ERR (acl);
@@ -750,7 +751,7 @@JFS_IP (inode)->i_acl =JFS_ACL_NOT_CACHED ;return 0 ; - }else if (strcmp (name,XATTR_NAME_ACL_DEFAULT ) ==0 ) { + }else if (strcmp (name,POSIX_ACL_XATTR_DEFAULT ) ==0 ) { acl =posix_acl_from_xattr (value, value_len);if (IS_ERR (acl)) { rc =PTR_ERR (acl);
fs/jfs/acl.c +6 -5
@@ -21,6 +21,7 @@#include <linux/sched.h> #include <linux/fs.h> #include <linux/quotaops.h> +#include <linux/posix_acl_xattr.h> #include "jfs_incore.h" #include "jfs_xattr.h" #include "jfs_acl.h"
@@ -36,11 +37,11 @@switch (type) {case ACL_TYPE_ACCESS : - ea_name =XATTR_NAME_ACL_ACCESS ; + ea_name =POSIX_ACL_XATTR_ACCESS ; p_acl = &ji->i_acl;break ;case ACL_TYPE_DEFAULT : - ea_name =XATTR_NAME_ACL_DEFAULT ; + ea_name =POSIX_ACL_XATTR_DEFAULT ; p_acl = &ji->i_default_acl;break ;default :
@@ -89,11 +90,11 @@switch (type) {case ACL_TYPE_ACCESS : - ea_name =XATTR_NAME_ACL_ACCESS ; + ea_name =POSIX_ACL_XATTR_ACCESS ; p_acl = &ji->i_acl;break ;case ACL_TYPE_DEFAULT : - ea_name =XATTR_NAME_ACL_DEFAULT ; + ea_name =POSIX_ACL_XATTR_DEFAULT ; p_acl = &ji->i_default_acl;if (!S_ISDIR (inode->i_mode))return acl ? -EACCES :0 ;
@@ -102,7 +103,7 @@return -EINVAL ; }if (acl) { - size =xattr_acl_size (acl->a_count); + size =posix_acl_xattr_size (acl->a_count); value =kmalloc (size,GFP_KERNEL );if (!value)return -ENOMEM ;