diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-21 20:05:55 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-21 20:05:55 +0200 |
| commit | 0d25971d7c969debf76f9fab6d6b37cb62408f55 (patch) | |
| tree | 89e6b432d4e8c84d59b4738e5bc1c47a2402adf2 /fs/jffs2/jffs2_fs_i.h | |
| parent | [MTD] Account for MODULE_SYMBOL_PREFIX when requesting NOR chip driver (diff) | |
| parent | [JFFS2] Finally eliminate __totlen field from struct jffs2_raw_node_ref (diff) | |
| download | linux-0d25971d7c969debf76f9fab6d6b37cb62408f55.tar.xz linux-0d25971d7c969debf76f9fab6d6b37cb62408f55.zip | |
Merge git://git.infradead.org/jffs2-devel-2.6
Diffstat (limited to 'fs/jffs2/jffs2_fs_i.h')
| -rw-r--r-- | fs/jffs2/jffs2_fs_i.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/jffs2/jffs2_fs_i.h b/fs/jffs2/jffs2_fs_i.h index ad565bf9dcc1..2e0cc8e00b85 100644 --- a/fs/jffs2/jffs2_fs_i.h +++ b/fs/jffs2/jffs2_fs_i.h @@ -5,6 +5,7 @@ #include <linux/version.h> #include <linux/rbtree.h> +#include <linux/posix_acl.h> #include <asm/semaphore.h> struct jffs2_inode_info { @@ -45,6 +46,10 @@ struct jffs2_inode_info { struct inode vfs_inode; #endif #endif +#ifdef CONFIG_JFFS2_FS_POSIX_ACL + struct posix_acl *i_acl_access; + struct posix_acl *i_acl_default; +#endif }; #endif /* _JFFS2_FS_I */ |