diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 05:08:43 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 05:08:43 -0400 |
commit | 0e3c9a2284f5417f196e327c254d0b84c9ee8929 (patch) | |
tree | e3fb40ebe7d042b4b3c1042bc7f2edaf7fb6eee0 /mm | |
parent | f17625b318d9b151e7bd41e31223e9d89b2aaa77 (diff) |
Revert "writeback: fix WB_SYNC_NONE writeback from umount"
This reverts commit e913fc825dc685a444cb4c1d0f9d32f372f59861.
We are investigating a hang associated with the WB_SYNC_NONE changes,
so revert them for now.
Conflicts:
fs/fs-writeback.c
mm/page-writeback.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page-writeback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index b289310e2c89..5fa63bdf52e4 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
@@ -597,7 +597,7 @@ static void balance_dirty_pages(struct address_space *mapping, | |||
597 | (!laptop_mode && ((global_page_state(NR_FILE_DIRTY) | 597 | (!laptop_mode && ((global_page_state(NR_FILE_DIRTY) |
598 | + global_page_state(NR_UNSTABLE_NFS)) | 598 | + global_page_state(NR_UNSTABLE_NFS)) |
599 | > background_thresh))) | 599 | > background_thresh))) |
600 | bdi_start_writeback(bdi, NULL, 0, 0); | 600 | bdi_start_writeback(bdi, NULL, 0); |
601 | } | 601 | } |
602 | 602 | ||
603 | void set_page_dirty_balance(struct page *page, int page_mkwrite) | 603 | void set_page_dirty_balance(struct page *page, int page_mkwrite) |
@@ -707,7 +707,7 @@ void laptop_mode_timer_fn(unsigned long data) | |||
707 | */ | 707 | */ |
708 | 708 | ||
709 | if (bdi_has_dirty_io(&q->backing_dev_info)) | 709 | if (bdi_has_dirty_io(&q->backing_dev_info)) |
710 | bdi_start_writeback(&q->backing_dev_info, NULL, nr_pages, 0); | 710 | bdi_start_writeback(&q->backing_dev_info, NULL, nr_pages); |
711 | } | 711 | } |
712 | 712 | ||
713 | /* | 713 | /* |