Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / xfs / linux-2.6 / xfs_aops.c

diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index d6fc4ef..87813e4 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -864,16 +864,9 @@ xfs_convert_page(
 
        if (startio) {
                if (count) {
-                       struct backing_dev_info *bdi;
-
-                       bdi = inode->i_mapping->backing_dev_info;
                        wbc->nr_to_write--;
-                       if (bdi_write_congested(bdi)) {
-                               wbc->encountered_congestion = 1;
-                               done = 1;
-                       } else if (wbc->nr_to_write <= 0) {
+                       if (wbc->nr_to_write <= 0)
                                done = 1;
-                       }
                }
                xfs_start_page_writeback(page, !page_dirty, count);
        }