From 34baf1ba54040df356e728b2e67f0f0273f498d0 Mon Sep 17 00:00:00 2001 From: Timothy Shimmin Date: Wed, 25 Jun 2008 11:52:40 +1000 Subject: xfs fix 1 Timothy Shimmin wrote: >>> 2. ACL's undefined >>> >>> CC fs/xfs/linux-2.6/xfs_xattr.o >>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c: In function 'xfs_decode_acl': >>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: '_ACL_TYPE_ACCESS' undeclared (first use in this function) >>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: (Each undeclared identifier is reported only once >>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: for each function it appears in.) >>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:42: error: '_ACL_TYPE_DEFAULT' undeclared (first use in this function) >>> make[3]: *** [fs/xfs/linux-2.6/xfs_xattr.o] Error 1 >> And this will be a !CONFIG_XFS_POSIX_ACL build, I think. >> > Yep. I didn't test the hch patch without CONFIG_XFS_POSIX_ACL. Oops. > > xfs_acl.h: > > #ifdef CONFIG_XFS_POSIX_ACL > ... > #define _ACL_TYPE_ACCESS 1 > #define _ACL_TYPE_DEFAULT 2 > ... > #endif > > There is a bunch of ACL code in linux-2.6/xfs_xattr.c. > Possibly we could just modify xfs_acl.h as I think most other calls > have the non CONFIG'ed versions. > I'll have a look. > So we could move up the acl defines in xfs_acl.h. Unless Christoph wants some other rearrangement... --- fs/xfs/xfs_acl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h index 332a772461c4..323ee94cf831 100644 --- a/fs/xfs/xfs_acl.h +++ b/fs/xfs/xfs_acl.h @@ -46,6 +46,8 @@ typedef struct xfs_acl { #define SGI_ACL_FILE_SIZE (sizeof(SGI_ACL_FILE)-1) #define SGI_ACL_DEFAULT_SIZE (sizeof(SGI_ACL_DEFAULT)-1) +#define _ACL_TYPE_ACCESS 1 +#define _ACL_TYPE_DEFAULT 2 #ifdef CONFIG_XFS_POSIX_ACL @@ -66,8 +68,6 @@ extern int xfs_acl_vset(bhv_vnode_t *, void *, size_t, int); extern int xfs_acl_vget(bhv_vnode_t *, void *, size_t, int); extern int xfs_acl_vremove(bhv_vnode_t *, int); -#define _ACL_TYPE_ACCESS 1 -#define _ACL_TYPE_DEFAULT 2 #define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE)) #define _ACL_INHERIT(c,m,d) (xfs_acl_inherit(c,m,d)) -- cgit v1.2.3