diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-12 00:01:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:15:14 -0400 |
commit | e30408b2a99cb7b8bf529c7dc2328a19d71894cf (patch) | |
tree | 3c4a258341db6ee1c94db296632db27bc519952b /fs/jfs/jfs_logmgr.c | |
parent | ce9d3c9a6a9aef61525be07fe6ba27d937236aa2 (diff) |
JFS: fix bio-related build breakage
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/jfs/jfs_logmgr.c')
-rw-r--r-- | fs/jfs/jfs_logmgr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 57c3b8ac36bf..ccfd02944053 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c | |||
@@ -2162,7 +2162,7 @@ static void lbmStartIO(struct lbuf * bp) | |||
2162 | /* check if journaling to disk has been disabled */ | 2162 | /* check if journaling to disk has been disabled */ |
2163 | if (log->no_integrity) { | 2163 | if (log->no_integrity) { |
2164 | bio->bi_size = 0; | 2164 | bio->bi_size = 0; |
2165 | lbmIODone(bio, 0, 0); | 2165 | lbmIODone(bio, 0); |
2166 | } else { | 2166 | } else { |
2167 | submit_bio(WRITE_SYNC, bio); | 2167 | submit_bio(WRITE_SYNC, bio); |
2168 | INCREMENT(lmStat.submitted); | 2168 | INCREMENT(lmStat.submitted); |
@@ -2234,8 +2234,6 @@ static void lbmIODone(struct bio *bio, int error) | |||
2234 | 2234 | ||
2235 | /* wakeup I/O initiator */ | 2235 | /* wakeup I/O initiator */ |
2236 | LCACHE_WAKEUP(&bp->l_ioevent); | 2236 | LCACHE_WAKEUP(&bp->l_ioevent); |
2237 | |||
2238 | return 0; | ||
2239 | } | 2237 | } |
2240 | 2238 | ||
2241 | /* | 2239 | /* |
@@ -2260,7 +2258,6 @@ static void lbmIODone(struct bio *bio, int error) | |||
2260 | if (bp->l_flag & lbmDIRECT) { | 2258 | if (bp->l_flag & lbmDIRECT) { |
2261 | LCACHE_WAKEUP(&bp->l_ioevent); | 2259 | LCACHE_WAKEUP(&bp->l_ioevent); |
2262 | LCACHE_UNLOCK(flags); | 2260 | LCACHE_UNLOCK(flags); |
2263 | return 0; | ||
2264 | } | 2261 | } |
2265 | 2262 | ||
2266 | tail = log->wqueue; | 2263 | tail = log->wqueue; |
@@ -2339,8 +2336,6 @@ static void lbmIODone(struct bio *bio, int error) | |||
2339 | 2336 | ||
2340 | LCACHE_UNLOCK(flags); /* unlock+enable */ | 2337 | LCACHE_UNLOCK(flags); /* unlock+enable */ |
2341 | } | 2338 | } |
2342 | |||
2343 | return 0; | ||
2344 | } | 2339 | } |
2345 | 2340 | ||
2346 | int jfsIOWait(void *arg) | 2341 | int jfsIOWait(void *arg) |