diff options
Diffstat (limited to 'fs/jfs')
-rw-r--r-- | fs/jfs/jfs_logmgr.c | 5 | ||||
-rw-r--r-- | fs/jfs/jfs_metapage.c | 12 |
2 files changed, 3 insertions, 14 deletions
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index de3e4a506dbc..57c3b8ac36bf 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c | |||
@@ -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 | */ |
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 62e96be02acf..1332adc0b9fa 100644 --- a/fs/jfs/jfs_metapage.c +++ b/fs/jfs/jfs_metapage.c | |||
@@ -280,14 +280,10 @@ static void last_read_complete(struct page *page) | |||
280 | unlock_page(page); | 280 | unlock_page(page); |
281 | } | 281 | } |
282 | 282 | ||
283 | static int metapage_read_end_io(struct bio *bio, unsigned int bytes_done, | 283 | static void metapage_read_end_io(struct bio *bio, int err) |
284 | int err) | ||
285 | { | 284 | { |
286 | struct page *page = bio->bi_private; | 285 | struct page *page = bio->bi_private; |
287 | 286 | ||
288 | if (bio->bi_size) | ||
289 | return 1; | ||
290 | |||
291 | if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) { | 287 | if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) { |
292 | printk(KERN_ERR "metapage_read_end_io: I/O error\n"); | 288 | printk(KERN_ERR "metapage_read_end_io: I/O error\n"); |
293 | SetPageError(page); | 289 | SetPageError(page); |
@@ -341,16 +337,12 @@ static void last_write_complete(struct page *page) | |||
341 | end_page_writeback(page); | 337 | end_page_writeback(page); |
342 | } | 338 | } |
343 | 339 | ||
344 | static int metapage_write_end_io(struct bio *bio, unsigned int bytes_done, | 340 | static void metapage_write_end_io(struct bio *bio, int err) |
345 | int err) | ||
346 | { | 341 | { |
347 | struct page *page = bio->bi_private; | 342 | struct page *page = bio->bi_private; |
348 | 343 | ||
349 | BUG_ON(!PagePrivate(page)); | 344 | BUG_ON(!PagePrivate(page)); |
350 | 345 | ||
351 | if (bio->bi_size) | ||
352 | return 1; | ||
353 | |||
354 | if (! test_bit(BIO_UPTODATE, &bio->bi_flags)) { | 346 | if (! test_bit(BIO_UPTODATE, &bio->bi_flags)) { |
355 | printk(KERN_ERR "metapage_write_end_io: I/O error\n"); | 347 | printk(KERN_ERR "metapage_write_end_io: I/O error\n"); |
356 | SetPageError(page); | 348 | SetPageError(page); |