]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
JFS: fix bio-related build breakage
authorJeff Garzik <jeff@garzik.org>
Fri, 12 Oct 2007 04:01:21 +0000 (00:01 -0400)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 04:15:14 +0000 (21:15 -0700)
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/jfs/jfs_logmgr.c

index 57c3b8ac36bf94937f329297455b6b6cdcbdf564..ccfd02944053b3178c4cbcab5604ef4621e6a2e4 100644 (file)
@@ -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)