diff options
Diffstat (limited to 'fs/jfs/jfs_metapage.c')
-rw-r--r-- | fs/jfs/jfs_metapage.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 62e96be02acf..941369c1ac8d 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); |
@@ -295,8 +291,6 @@ static int metapage_read_end_io(struct bio *bio, unsigned int bytes_done, | |||
295 | 291 | ||
296 | dec_io(page, last_read_complete); | 292 | dec_io(page, last_read_complete); |
297 | bio_put(bio); | 293 | bio_put(bio); |
298 | |||
299 | return 0; | ||
300 | } | 294 | } |
301 | 295 | ||
302 | static void remove_from_logsync(struct metapage *mp) | 296 | static void remove_from_logsync(struct metapage *mp) |
@@ -341,23 +335,18 @@ static void last_write_complete(struct page *page) | |||
341 | end_page_writeback(page); | 335 | end_page_writeback(page); |
342 | } | 336 | } |
343 | 337 | ||
344 | static int metapage_write_end_io(struct bio *bio, unsigned int bytes_done, | 338 | static void metapage_write_end_io(struct bio *bio, int err) |
345 | int err) | ||
346 | { | 339 | { |
347 | struct page *page = bio->bi_private; | 340 | struct page *page = bio->bi_private; |
348 | 341 | ||
349 | BUG_ON(!PagePrivate(page)); | 342 | BUG_ON(!PagePrivate(page)); |
350 | 343 | ||
351 | if (bio->bi_size) | ||
352 | return 1; | ||
353 | |||
354 | if (! test_bit(BIO_UPTODATE, &bio->bi_flags)) { | 344 | if (! test_bit(BIO_UPTODATE, &bio->bi_flags)) { |
355 | printk(KERN_ERR "metapage_write_end_io: I/O error\n"); | 345 | printk(KERN_ERR "metapage_write_end_io: I/O error\n"); |
356 | SetPageError(page); | 346 | SetPageError(page); |
357 | } | 347 | } |
358 | dec_io(page, last_write_complete); | 348 | dec_io(page, last_write_complete); |
359 | bio_put(bio); | 349 | bio_put(bio); |
360 | return 0; | ||
361 | } | 350 | } |
362 | 351 | ||
363 | static int metapage_writepage(struct page *page, struct writeback_control *wbc) | 352 | static int metapage_writepage(struct page *page, struct writeback_control *wbc) |