diff options
Diffstat (limited to 'fs/jfs/jfs_logmgr.c')
-rw-r--r-- | fs/jfs/jfs_logmgr.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index de3e4a506dbc..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); |
@@ -2200,16 +2200,13 @@ static int lbmIOWait(struct lbuf * bp, int flag) | |||
2200 | * | 2200 | * |
2201 | * executed at INTIODONE level | 2201 | * executed at INTIODONE level |
2202 | */ | 2202 | */ |
2203 | static int lbmIODone(struct bio *bio, unsigned int bytes_done, int error) | 2203 | static void lbmIODone(struct bio *bio, int error) |
2204 | { | 2204 | { |
2205 | struct lbuf *bp = bio->bi_private; | 2205 | struct lbuf *bp = bio->bi_private; |
2206 | struct lbuf *nextbp, *tail; | 2206 | struct lbuf *nextbp, *tail; |
2207 | struct jfs_log *log; | 2207 | struct jfs_log *log; |
2208 | unsigned long flags; | 2208 | unsigned long flags; |
2209 | 2209 | ||
2210 | if (bio->bi_size) | ||
2211 | return 1; | ||
2212 | |||
2213 | /* | 2210 | /* |
2214 | * get back jfs buffer bound to the i/o buffer | 2211 | * get back jfs buffer bound to the i/o buffer |
2215 | */ | 2212 | */ |
@@ -2237,8 +2234,6 @@ static int lbmIODone(struct bio *bio, unsigned int bytes_done, int error) | |||
2237 | 2234 | ||
2238 | /* wakeup I/O initiator */ | 2235 | /* wakeup I/O initiator */ |
2239 | LCACHE_WAKEUP(&bp->l_ioevent); | 2236 | LCACHE_WAKEUP(&bp->l_ioevent); |
2240 | |||
2241 | return 0; | ||
2242 | } | 2237 | } |
2243 | 2238 | ||
2244 | /* | 2239 | /* |
@@ -2263,7 +2258,6 @@ static int lbmIODone(struct bio *bio, unsigned int bytes_done, int error) | |||
2263 | if (bp->l_flag & lbmDIRECT) { | 2258 | if (bp->l_flag & lbmDIRECT) { |
2264 | LCACHE_WAKEUP(&bp->l_ioevent); | 2259 | LCACHE_WAKEUP(&bp->l_ioevent); |
2265 | LCACHE_UNLOCK(flags); | 2260 | LCACHE_UNLOCK(flags); |
2266 | return 0; | ||
2267 | } | 2261 | } |
2268 | 2262 | ||
2269 | tail = log->wqueue; | 2263 | tail = log->wqueue; |
@@ -2342,8 +2336,6 @@ static int lbmIODone(struct bio *bio, unsigned int bytes_done, int error) | |||
2342 | 2336 | ||
2343 | LCACHE_UNLOCK(flags); /* unlock+enable */ | 2337 | LCACHE_UNLOCK(flags); /* unlock+enable */ |
2344 | } | 2338 | } |
2345 | |||
2346 | return 0; | ||
2347 | } | 2339 | } |
2348 | 2340 | ||
2349 | int jfsIOWait(void *arg) | 2341 | int jfsIOWait(void *arg) |