Re: [xfs-masters] Re: linux-next: Tree for June 24 (XFS x2)

[Stephen Rothwell]

On Wed, 25 Jun 2008 11:52:40 +1000 Timothy Shimmin <tes@xxxxxxx> wrote:
>
> So we could move up the acl defines in xfs_acl.h.
> Unless Christoph wants some other rearrangement...
> 
> Index: 2.6.x-xfs-quilt/fs/xfs/xfs_acl.h
> ===================================================================
> --- 2.6.x-xfs-quilt.orig/fs/xfs/xfs_acl.h	2008-06-25 10:46:42.000000000 +1000
> +++ 2.6.x-xfs-quilt/fs/xfs/xfs_acl.h	2008-06-25 11:45:25.221045485 +1000
> @@ -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 *, v
>  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))
> 

I have applied this to linux-next for today, please apply it (or
something similar) to the xfs tree soon.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature