Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262257AbVEROeD (ORCPT ); Wed, 18 May 2005 10:34:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262256AbVEROdx (ORCPT ); Wed, 18 May 2005 10:33:53 -0400 Received: from pentafluge.infradead.org ([213.146.154.40]:25573 "EHLO pentafluge.infradead.org") by vger.kernel.org with ESMTP id S262227AbVEROKY (ORCPT ); Wed, 18 May 2005 10:10:24 -0400 Date: Wed, 18 May 2005 15:09:58 +0100 From: Christoph Hellwig To: Russell Miller , marcelo.tosatti@cyclades.com Cc: linux-kernel@vger.kernel.org Subject: Re: 2.4.30 xfs bug Message-ID: <20050518140958.GA22771@infradead.org> Mail-Followup-To: Christoph Hellwig , Russell Miller , marcelo.tosatti@cyclades.com, linux-kernel@vger.kernel.org References: <200505121117.01192.rmiller@duskglow.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200505121117.01192.rmiller@duskglow.com> User-Agent: Mutt/1.4.1i X-SRS-Rewrite: SMTP reverse-path rewritten from by pentafluge.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 995 Lines: 28 On Thu, May 12, 2005 at 11:17:01AM -0700, Russell Miller wrote: > 2.4.30 will not compile if XFS is turned on, but XFS debugging is not. > Culprit is: > > fs/xfs/linux-2.4/xfs_buf.c line 1076. Apparently pagebuf_lock_value is used > somewhere else, even if it's not defined because debugging is off. Looks like a trivial one-liner got lost when merging from the SGI CVS tree. Macelo, can you apply this little patch below? --- 1.195/fs/xfs/linux-2.4/xfs_buf.c 2005-01-12 01:08:23 +01:00 +++ edited/fs/xfs/linux-2.4/xfs_buf.c 2005-05-18 16:06:09 +02:00 @@ -1073,7 +1073,7 @@ pagebuf_cond_lock( /* lock buffer, if return(locked ? 0 : -EBUSY); } -#ifdef DEBUG +#if defined(DEBUG) || defined(XFS_BLI_TRACE) /* * pagebuf_lock_value * - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/