diff options
Diffstat (limited to 'fs/fs-writeback.c')
-rw-r--r-- | fs/fs-writeback.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 0793961f7699..49bc1b8e8f19 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
@@ -639,14 +639,6 @@ static void writeback_inodes_wb(struct bdi_writeback *wb, | |||
639 | continue; | 639 | continue; |
640 | } | 640 | } |
641 | 641 | ||
642 | if (wbc->nonblocking && bdi_write_congested(wb->bdi)) { | ||
643 | wbc->encountered_congestion = 1; | ||
644 | if (!is_blkdev_sb) | ||
645 | break; /* Skip a congested fs */ | ||
646 | requeue_io(inode); | ||
647 | continue; /* Skip a congested blockdev */ | ||
648 | } | ||
649 | |||
650 | /* | 642 | /* |
651 | * Was this inode dirtied after sync_sb_inodes was called? | 643 | * Was this inode dirtied after sync_sb_inodes was called? |
652 | * This keeps sync from extra jobs and livelock. | 644 | * This keeps sync from extra jobs and livelock. |
@@ -770,7 +762,6 @@ static long wb_writeback(struct bdi_writeback *wb, | |||
770 | break; | 762 | break; |
771 | 763 | ||
772 | wbc.more_io = 0; | 764 | wbc.more_io = 0; |
773 | wbc.encountered_congestion = 0; | ||
774 | wbc.nr_to_write = MAX_WRITEBACK_PAGES; | 765 | wbc.nr_to_write = MAX_WRITEBACK_PAGES; |
775 | wbc.pages_skipped = 0; | 766 | wbc.pages_skipped = 0; |
776 | writeback_inodes_wb(wb, &wbc); | 767 | writeback_inodes_wb(wb, &wbc); |