JFS: fix bio-related build breakage
PATCH 1/1 JFS: fix bio-related build breakage
Signed-off-by Jeff Garzik <[email protected]>
fs/jfs/jfs_logmgr.c +1 -6
@@ -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)
I'd say add my ack, but I see it's already been picked up.
Thanks,
Shaggy
Quoted 41 lines · Jeff Garzik
Signed-off-by Jeff Garzik <[email protected]>fs/jfs/jfs_logmgr.c +1
-6@@ -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)
Signature · 2 lines
David Kleikamp IBM Linux Technology Center