projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
[powerpc.git]
/
fs
/
ocfs2
/
inode.h
diff --git
a/fs/ocfs2/inode.h
b/fs/ocfs2/inode.h
index
a41d081
..
70e881c
100644
(file)
--- a/
fs/ocfs2/inode.h
+++ b/
fs/ocfs2/inode.h
@@
-51,6
+51,7
@@
struct ocfs2_inode_info
u32 ip_flags; /* see below */
u32 ip_attr; /* inode attributes */
+ u16 ip_dyn_features;
/* protected by recovery_lock. */
struct inode *ip_next_orphan;