From: Theodore Tso Subject: Re: [stable] Linux 2.6.28.8 (ocfs2 build failure) Date: Sun, 22 Mar 2009 22:44:04 -0400 Message-ID: <20090323024404.GA14082@mit.edu> References: <20090317012028.GA32410@kroah.com> <49C00787.6060401@oracle.com> <20090317205518.GA4442@kroah.com> <49C00FE9.9040407@oracle.com> <20090320221750.GA32416@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Randy Dunlap , Jan Kara , Greg KH , mfasheh@suse.com, Andrew Morton , torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, stable@kernel.org, Dan Carpenter , mfasheh@suse.de, linux-ext4@vger.kernel.org, ocfs2-devel@oss.oracle.com To: Greg KH Return-path: Received: from THUNK.ORG ([69.25.196.29]:40354 "EHLO thunker.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754444AbZCWCpS (ORCPT ); Sun, 22 Mar 2009 22:45:18 -0400 Content-Disposition: inline In-Reply-To: <20090320221750.GA32416@kroah.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Fri, Mar 20, 2009 at 03:17:50PM -0700, Greg KH wrote: > > I tracked this down to commit 54dc90 in the 2.6.28.8 tree. > > I've included it below. Jan and Ted, any ideas on how to fix this > error? 2.6.29 dropped the CONFIG_OCFS2_COMPAT_JBD option; if you enable it, causes a compile failure in 2.6.28.8. This should fix it... diff --git a/fs/ocfs2/ocfs2_jbd_compat.h b/fs/ocfs2/ocfs2_jbd_compat.h index b91c78f..268949b 100644 --- a/fs/ocfs2/ocfs2_jbd_compat.h +++ b/fs/ocfs2/ocfs2_jbd_compat.h @@ -60,7 +60,8 @@ static inline int jbd2_journal_file_inode(handle_t *handle, return 0; } -static inline int jbd2_journal_begin_ordered_truncate(struct jbd2_inode *inode, +static inline int jbd2_journal_begin_ordered_truncate(journal_t *journal, + struct jbd2_inode *inode, loff_t new_size) { return 0; > Should I just revert this from the 2.6.28 tree? Or does no one really > care about ocfs2 in the stable tree? I'm not sure how much people will care about CONFIG_OCFS2_COMPAT_JBD, given that it disappears in 2.6.29, but the above patch should fix things. - Ted