diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fs-writeback.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index aca8835c8c17..68851ff2fd41 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
@@ -963,7 +963,7 @@ static long wb_check_old_data_flush(struct bdi_writeback *wb) | |||
963 | /* | 963 | /* |
964 | * Retrieve work items and do the writeback they describe | 964 | * Retrieve work items and do the writeback they describe |
965 | */ | 965 | */ |
966 | static long wb_do_writeback(struct bdi_writeback *wb, int force_wait) | 966 | static long wb_do_writeback(struct bdi_writeback *wb) |
967 | { | 967 | { |
968 | struct backing_dev_info *bdi = wb->bdi; | 968 | struct backing_dev_info *bdi = wb->bdi; |
969 | struct wb_writeback_work *work; | 969 | struct wb_writeback_work *work; |
@@ -971,12 +971,6 @@ static long wb_do_writeback(struct bdi_writeback *wb, int force_wait) | |||
971 | 971 | ||
972 | set_bit(BDI_writeback_running, &wb->bdi->state); | 972 | set_bit(BDI_writeback_running, &wb->bdi->state); |
973 | while ((work = get_next_work_item(bdi)) != NULL) { | 973 | while ((work = get_next_work_item(bdi)) != NULL) { |
974 | /* | ||
975 | * Override sync mode, in case we must wait for completion | ||
976 | * because this thread is exiting now. | ||
977 | */ | ||
978 | if (force_wait) | ||
979 | work->sync_mode = WB_SYNC_ALL; | ||
980 | 974 | ||
981 | trace_writeback_exec(bdi, work); | 975 | trace_writeback_exec(bdi, work); |
982 | 976 | ||
@@ -1025,7 +1019,7 @@ void bdi_writeback_workfn(struct work_struct *work) | |||
1025 | * rescuer as work_list needs to be drained. | 1019 | * rescuer as work_list needs to be drained. |
1026 | */ | 1020 | */ |
1027 | do { | 1021 | do { |
1028 | pages_written = wb_do_writeback(wb, 0); | 1022 | pages_written = wb_do_writeback(wb); |
1029 | trace_writeback_pages_written(pages_written); | 1023 | trace_writeback_pages_written(pages_written); |
1030 | } while (!list_empty(&bdi->work_list)); | 1024 | } while (!list_empty(&bdi->work_list)); |
1031 | } else { | 1025 | } else { |