diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-13 04:28:59 +0200 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-13 04:28:59 +0200 |
| commit | fd40261354802b0f05f6f67121235aa002e87069 (patch) | |
| tree | 935f23fa1528f6fe5a078383c9343907ea27fbb3 /fs/xfs/xfs_inode.h | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | xfs: fix small mismerge in xfs_vn_mknod (diff) | |
| download | linux-fd40261354802b0f05f6f67121235aa002e87069.tar.xz linux-fd40261354802b0f05f6f67121235aa002e87069.zip | |
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
Diffstat (limited to 'fs/xfs/xfs_inode.h')
| -rw-r--r-- | fs/xfs/xfs_inode.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index f879c1bc4b96..77016702938b 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -18,6 +18,7 @@ #ifndef __XFS_INODE_H__ #define __XFS_INODE_H__ +struct posix_acl; struct xfs_dinode; struct xfs_inode; @@ -272,6 +273,11 @@ typedef struct xfs_inode { /* VFS inode */ struct inode i_vnode; /* embedded VFS inode */ +#ifdef CONFIG_XFS_POSIX_ACL + struct posix_acl *i_acl; + struct posix_acl *i_default_acl; +#endif + /* Trace buffers per inode. */ #ifdef XFS_INODE_TRACE struct ktrace *i_trace; /* general inode trace */ |