In the 2.6.27 series, commit 19815ad26f2d60e3ce390fca4d18ad729c9f5f42
has an extra chunk. I applied this patch after the series to fix it:
In file included from fs/ocfs2/alloc.c:42:
fs/ocfs2/journal.h: In function 'ocfs2_jbd2_file_inode':
fs/ocfs2/journal.h:420: error: implicit declaration of function 'jbd2_journal_file_inode'
fs/ocfs2/journal.h:420: error: 'struct ocfs2_inode_info' has no member named 'ip_jinode'
fs/ocfs2/journal.h: In function 'ocfs2_begin_ordered_truncate':
fs/ocfs2/journal.h:426: error: implicit declaration of function 'jbd2_journal_begin_ordered_truncate'
fs/ocfs2/journal.h:428: error: 'struct ocfs2_inode_info' has no member named 'ip_jinode'
[caused by the ext4 patch queue]
--- linux-2.6.27.noarch.orig/fs/ocfs2/journal.h
+++ linux-2.6.27.noarch/fs/ocfs2/journal.h
@@ -415,17 +415,4 @@ static inline int ocfs2_calc_tree_trunc_
return credits;
}
-static inline int ocfs2_jbd2_file_inode(handle_t *handle, struct inode *inode)
-{
- return jbd2_journal_file_inode(handle, &OCFS2_I(inode)->ip_jinode);
-}
-
-static inline int ocfs2_begin_ordered_truncate(struct inode *inode,
- loff_t new_size)
-{
- return jbd2_journal_begin_ordered_truncate(
- OCFS2_SB(inode->i_sb)->journal->j_journal,
- &OCFS2_I(inode)->ip_jinode,
- new_size);
-}
#endif /* OCFS2_JOURNAL_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
