Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5ffa387 authored by Tejun Heo's avatar Tejun Heo Committed by Alasdair G Kergon
Browse files

dm: dont use flush_scheduled_work 



flush_scheduled_work() is being deprecated.  Flush the used work
directly instead.  In all dm targets, the only work which uses
system_wq is ->trigger_event.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent fecec20e

drivers/md/dm-mpath.c

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ static void flush_multipath_work(struct multipath *m) 
	flush_workqueue(kmpath_handlerd);

	multipath_wait_for_pg_init_completion(m);

	flush_workqueue(kmultipathd);

	flush_scheduled_work();

	flush_work_sync(&m->trigger_event);

}



static void multipath_dtr(struct dm_target *ti)

drivers/md/dm-raid1.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static void mirror_dtr(struct dm_target *ti) 


	del_timer_sync(&ms->timer);

	flush_workqueue(ms->kmirrord_wq);

	flush_scheduled_work();

	flush_work_sync(&ms->trigger_event);

	dm_kcopyd_client_destroy(ms->kcopyd_client);

	destroy_workqueue(ms->kmirrord_wq);

	free_context(ms, ti, ms->nr_mirrors);