On Thu, Feb 05, 2009 at 03:52:59PM +0100, Jan Kara wrote: > > Hi, > > the three patches below fix a bug in jbd2_journal_begin_ordered_truncate() that > could possibly lead to NULL pointer dereference. The question is how to merge > the fix as it changes the prototype of the function and both ext4 and ocfs2 use it. > Mark, Mingming, any suggestions? This seems like it'd be easiest for Andrew to carry. The Ocfs2 patch is unlikely to conflict with anything in my tree. Btw, you can add: Acked-by: Mark Fasheh <mfasheh@xxxxxxxx> to the Ocfs2 patch. --Mark -- Mark Fasheh -- 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