git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
fs
/
ocfs2
/
inode.h
diff --git
a/fs/ocfs2/inode.h
b/fs/ocfs2/inode.h
index
0b28e19
..
9f5f5fc
100644
(file)
--- a/
fs/ocfs2/inode.h
+++ b/
fs/ocfs2/inode.h
@@
-70,6
+70,8
@@
struct ocfs2_inode_info
/* Only valid if the inode is the dir. */
u32 ip_last_used_slot;
u64 ip_last_used_group;
+
+ struct ocfs2_alloc_reservation ip_la_data_resv;
};
/*