2009-02-24 20:46:30

by Chuck Ebbert

Subject: Re: Ext4 tree backports for 2.6.27.19 and 2.6.28.7

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);
-}

2009-02-24 21:11:00

by Theodore Ts'o

Subject: Re: Ext4 tree backports for 2.6.27.19 and 2.6.28.7

On Tue, Feb 24, 2009 at 03:45:38PM -0500, Chuck Ebbert wrote:
> In the 2.6.27 series, commit 19815ad26f2d60e3ce390fca4d18ad729c9f5f42
> has an extra chunk. I applied this patch after the series to fix it:

Thanks for spotting this. I'll submit an update to the stable kernel
series submission.

- Ted