git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
jffs2
/
jffs2_fs_i.h
diff --git
a/include/linux/jffs2_fs_i.h
b/fs/jffs2/jffs2_fs_i.h
similarity index 91%
rename from
include/linux/jffs2_fs_i.h
rename to
fs/jffs2/jffs2_fs_i.h
index
ad565bf
..
3a56607
100644
(file)
--- a/
include/linux/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/version.h>
#include <linux/rbtree.h>
+#include <linux/posix_acl.h>
#include <asm/semaphore.h>
struct jffs2_inode_info {
#include <asm/semaphore.h>
struct jffs2_inode_info {
@@
-40,10
+41,10
@@
struct jffs2_inode_info {
uint16_t flags;
uint8_t usercompr;
uint16_t flags;
uint8_t usercompr;
-#if !defined (__ECOS)
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,2)
struct inode vfs_inode;
struct inode vfs_inode;
-#endif
+#ifdef CONFIG_JFFS2_FS_POSIX_ACL
+ struct posix_acl *i_acl_access;
+ struct posix_acl *i_acl_default;
#endif
};
#endif
};