Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 136f8f21 authored by Tim Shimmin's avatar Tim Shimmin Committed by Niv Sardi
Browse files

[XFS] Fix up problem when CONFIG_XFS_POSIX_ACL is not set and yet we still 


can use the _ACL_TYPE_* definitions in linux-2.6/xfs_xattr.c. The
forthcoming generic acl code will also fix this problem.

SGI-PV: 982343

SGI-Modid: xfs-linux-melb:xfs-kern:31369a

Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 2edbddd5

fs/xfs/xfs_acl.h

+2 −2
Original line number Diff line number Diff line
@@ -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))