diff options
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/dm-mpath.c | 2 | ||||
-rw-r--r-- | drivers/md/dm-raid1.c | 2 | ||||
-rw-r--r-- | drivers/md/dm-stripe.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 034233eefc82..d778563a4ffd 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c | |||
@@ -944,7 +944,7 @@ static void flush_multipath_work(struct multipath *m) | |||
944 | flush_workqueue(kmpath_handlerd); | 944 | flush_workqueue(kmpath_handlerd); |
945 | multipath_wait_for_pg_init_completion(m); | 945 | multipath_wait_for_pg_init_completion(m); |
946 | flush_workqueue(kmultipathd); | 946 | flush_workqueue(kmultipathd); |
947 | flush_work_sync(&m->trigger_event); | 947 | flush_work(&m->trigger_event); |
948 | } | 948 | } |
949 | 949 | ||
950 | static void multipath_dtr(struct dm_target *ti) | 950 | static void multipath_dtr(struct dm_target *ti) |
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index bc5ddba8045b..fd61f98ee1f6 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c | |||
@@ -1146,7 +1146,7 @@ static void mirror_dtr(struct dm_target *ti) | |||
1146 | 1146 | ||
1147 | del_timer_sync(&ms->timer); | 1147 | del_timer_sync(&ms->timer); |
1148 | flush_workqueue(ms->kmirrord_wq); | 1148 | flush_workqueue(ms->kmirrord_wq); |
1149 | flush_work_sync(&ms->trigger_event); | 1149 | flush_work(&ms->trigger_event); |
1150 | dm_kcopyd_client_destroy(ms->kcopyd_client); | 1150 | dm_kcopyd_client_destroy(ms->kcopyd_client); |
1151 | destroy_workqueue(ms->kmirrord_wq); | 1151 | destroy_workqueue(ms->kmirrord_wq); |
1152 | free_context(ms, ti, ms->nr_mirrors); | 1152 | free_context(ms, ti, ms->nr_mirrors); |
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c index a087bf2a8d66..e2f876539743 100644 --- a/drivers/md/dm-stripe.c +++ b/drivers/md/dm-stripe.c | |||
@@ -199,7 +199,7 @@ static void stripe_dtr(struct dm_target *ti) | |||
199 | for (i = 0; i < sc->stripes; i++) | 199 | for (i = 0; i < sc->stripes; i++) |
200 | dm_put_device(ti, sc->stripe[i].dev); | 200 | dm_put_device(ti, sc->stripe[i].dev); |
201 | 201 | ||
202 | flush_work_sync(&sc->trigger_event); | 202 | flush_work(&sc->trigger_event); |
203 | kfree(sc); | 203 | kfree(sc); |
204 | } | 204 | } |
205 | 205 | ||