diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_aops.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 120626789406..74d8be87f983 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -540,7 +540,7 @@ xfs_probe_cluster( | |||
540 | 540 | ||
541 | /* First sum forwards in this page */ | 541 | /* First sum forwards in this page */ |
542 | do { | 542 | do { |
543 | if (mapped != buffer_mapped(bh)) | 543 | if (!buffer_uptodate(bh) || (mapped != buffer_mapped(bh))) |
544 | return total; | 544 | return total; |
545 | total += bh->b_size; | 545 | total += bh->b_size; |
546 | } while ((bh = bh->b_this_page) != head); | 546 | } while ((bh = bh->b_this_page) != head); |
@@ -747,10 +747,11 @@ xfs_convert_page( | |||
747 | struct backing_dev_info *bdi; | 747 | struct backing_dev_info *bdi; |
748 | 748 | ||
749 | bdi = inode->i_mapping->backing_dev_info; | 749 | bdi = inode->i_mapping->backing_dev_info; |
750 | wbc->nr_to_write--; | ||
750 | if (bdi_write_congested(bdi)) { | 751 | if (bdi_write_congested(bdi)) { |
751 | wbc->encountered_congestion = 1; | 752 | wbc->encountered_congestion = 1; |
752 | done = 1; | 753 | done = 1; |
753 | } else if (--wbc->nr_to_write <= 0) { | 754 | } else if (wbc->nr_to_write <= 0) { |
754 | done = 1; | 755 | done = 1; |
755 | } | 756 | } |
756 | } | 757 | } |
@@ -1462,4 +1463,5 @@ struct address_space_operations linvfs_aops = { | |||
1462 | .commit_write = generic_commit_write, | 1463 | .commit_write = generic_commit_write, |
1463 | .bmap = linvfs_bmap, | 1464 | .bmap = linvfs_bmap, |
1464 | .direct_IO = linvfs_direct_IO, | 1465 | .direct_IO = linvfs_direct_IO, |
1466 | .migratepage = buffer_migrate_page, | ||
1465 | }; | 1467 | }; |