Commit e30408b2 authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds
Browse files

JFS: fix bio-related build breakage


Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce9d3c9a
...@@ -2162,7 +2162,7 @@ static void lbmStartIO(struct lbuf * bp) ...@@ -2162,7 +2162,7 @@ static void lbmStartIO(struct lbuf * bp)
/* check if journaling to disk has been disabled */ /* check if journaling to disk has been disabled */
if (log->no_integrity) { if (log->no_integrity) {
bio->bi_size = 0; bio->bi_size = 0;
lbmIODone(bio, 0, 0); lbmIODone(bio, 0);
} else { } else {
submit_bio(WRITE_SYNC, bio); submit_bio(WRITE_SYNC, bio);
INCREMENT(lmStat.submitted); INCREMENT(lmStat.submitted);
...@@ -2234,8 +2234,6 @@ static void lbmIODone(struct bio *bio, int error) ...@@ -2234,8 +2234,6 @@ static void lbmIODone(struct bio *bio, int error)
/* wakeup I/O initiator */ /* wakeup I/O initiator */
LCACHE_WAKEUP(&bp->l_ioevent); LCACHE_WAKEUP(&bp->l_ioevent);
return 0;
} }
/* /*
...@@ -2260,7 +2258,6 @@ static void lbmIODone(struct bio *bio, int error) ...@@ -2260,7 +2258,6 @@ static void lbmIODone(struct bio *bio, int error)
if (bp->l_flag & lbmDIRECT) { if (bp->l_flag & lbmDIRECT) {
LCACHE_WAKEUP(&bp->l_ioevent); LCACHE_WAKEUP(&bp->l_ioevent);
LCACHE_UNLOCK(flags); LCACHE_UNLOCK(flags);
return 0;
} }
tail = log->wqueue; tail = log->wqueue;
...@@ -2339,8 +2336,6 @@ static void lbmIODone(struct bio *bio, int error) ...@@ -2339,8 +2336,6 @@ static void lbmIODone(struct bio *bio, int error)
LCACHE_UNLOCK(flags); /* unlock+enable */ LCACHE_UNLOCK(flags); /* unlock+enable */
} }
return 0;
} }
int jfsIOWait(void *arg) int jfsIOWait(void *arg)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment