1 files changed, 2 insertions, 13 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 4afeefe9e365..cb7c5e323814 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -376,13 +376,7 @@ static void bdi_wb_shutdown(struct backing_dev_info *bdi)
        mod_delayed_work(bdi_wq, &bdi->wb.dwork, 0);
        flush_delayed_work(&bdi->wb.dwork);
        WARN_ON(!list_empty(&bdi->work_list));
+        WARN_ON(delayed_work_pending(&bdi->wb.dwork));
-        /*
-         * This shouldn't be necessary unless @bdi for some reason has
-         * unflushed dirty IO after work_list is drained.  Do it anyway
-         * just in case.
-         */
-        cancel_delayed_work_sync(&bdi->wb.dwork);
 }
 /*
@@ -497,12 +491,7 @@ void bdi_destroy(struct backing_dev_info *bdi)
        bdi_unregister(bdi);
-        /*
+        WARN_ON(delayed_work_pending(&bdi->wb.dwork));
-         * If bdi_unregister() had already been called earlier, the dwork
-         * could still be pending because bdi_prune_sb() can race with the
-         * bdi_wakeup_thread_delayed() calls from __mark_inode_dirty().
-         */
-        cancel_delayed_work_sync(&bdi->wb.dwork);
        for (i = 0; i < NR_BDI_STAT_ITEMS; i++)
                percpu_counter_destroy(&bdi->bdi_stat[i]);

diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 4afeefe9e365..cb7c5e323814 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c
@@ -376,13 +376,7 @@ static void bdi_wb_shutdown(struct backing_dev_info *bdi)
376	mod_delayed_work(bdi_wq, &bdi->wb.dwork, 0);	376	mod_delayed_work(bdi_wq, &bdi->wb.dwork, 0);
377	flush_delayed_work(&bdi->wb.dwork);	377	flush_delayed_work(&bdi->wb.dwork);
378	WARN_ON(!list_empty(&bdi->work_list));	378	WARN_ON(!list_empty(&bdi->work_list));
379		379	WARN_ON(delayed_work_pending(&bdi->wb.dwork));
380	/*
381	* This shouldn't be necessary unless @bdi for some reason has
382	* unflushed dirty IO after work_list is drained. Do it anyway
383	* just in case.
384	*/
385	cancel_delayed_work_sync(&bdi->wb.dwork);
386	}	380	}
387		381
388	/*	382	/*
@@ -497,12 +491,7 @@ void bdi_destroy(struct backing_dev_info *bdi)
497		491
498	bdi_unregister(bdi);	492	bdi_unregister(bdi);
499		493
500	/*	494	WARN_ON(delayed_work_pending(&bdi->wb.dwork));
501	* If bdi_unregister() had already been called earlier, the dwork
502	* could still be pending because bdi_prune_sb() can race with the
503	* bdi_wakeup_thread_delayed() calls from __mark_inode_dirty().
504	*/
505	cancel_delayed_work_sync(&bdi->wb.dwork);
506		495
507	for (i = 0; i < NR_BDI_STAT_ITEMS; i++)	496	for (i = 0; i < NR_BDI_STAT_ITEMS; i++)
508	percpu_counter_destroy(&bdi->bdi_stat[i]);	497	percpu_counter_destroy(&bdi->bdi_stat[i]);