diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-11 16:56:49 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-11 16:56:49 -0500 |
| commit | 35fd035968de4f674b9d62ee7b1d80ab7a50c384 (patch) | |
| tree | 53a936ecdf8e9c59735fa4e7794ccb503b06d5d5 /fs/xfs/xfs_inode.h | |
| parent | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (diff) | |
| parent | ef14f0c1578dce4b688726eb2603e50b62d6665a (diff) | |
| download | op-kernel-dev-35fd035968de4f674b9d62ee7b1d80ab7a50c384.zip op-kernel-dev-35fd035968de4f674b9d62ee7b1d80ab7a50c384.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
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 f879c1b..7701670 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 */ |
