Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754790AbXJLEBb (ORCPT ); Fri, 12 Oct 2007 00:01:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750835AbXJLEBX (ORCPT ); Fri, 12 Oct 2007 00:01:23 -0400 Received: from havoc.gtf.org ([69.61.125.42]:40034 "EHLO havoc.gtf.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750731AbXJLEBW (ORCPT ); Fri, 12 Oct 2007 00:01:22 -0400 Date: Fri, 12 Oct 2007 00:01:21 -0400 From: Jeff Garzik To: Andrew Morton , Linus Torvalds , shaggy@austin.ibm.com Cc: LKML Subject: [PATCH] JFS: fix bio-related build breakage Message-ID: <20071012040121.GA16274@havoc.gtf.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.14 (2007-02-12) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1254 Lines: 47 Signed-off-by: Jeff Garzik diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 57c3b8a..ccfd029 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -2162,7 +2162,7 @@ static void lbmStartIO(struct lbuf * bp) /* check if journaling to disk has been disabled */ if (log->no_integrity) { bio->bi_size = 0; - lbmIODone(bio, 0, 0); + lbmIODone(bio, 0); } else { submit_bio(WRITE_SYNC, bio); INCREMENT(lmStat.submitted); @@ -2234,8 +2234,6 @@ static void lbmIODone(struct bio *bio, int error) /* wakeup I/O initiator */ LCACHE_WAKEUP(&bp->l_ioevent); - - return 0; } /* @@ -2260,7 +2258,6 @@ static void lbmIODone(struct bio *bio, int error) if (bp->l_flag & lbmDIRECT) { LCACHE_WAKEUP(&bp->l_ioevent); LCACHE_UNLOCK(flags); - return 0; } tail = log->wqueue; @@ -2339,8 +2336,6 @@ static void lbmIODone(struct bio *bio, int error) LCACHE_UNLOCK(flags); /* unlock+enable */ } - - return 0; } int jfsIOWait(void *arg) - 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/