dm: stop using WQ_NON_REENTRANT

dbf2576e37 ("workqueue: make all workqueues non-reentrant") made
WQ_NON_REENTRANT no-op and the flag is going away.  Remove its usages.

This patch doesn't introduce any behavior changes.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Acked-by: Joe Thornber <ejt@redhat.com>

4 files changed, 5 insertions, 14 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 6d2d41ae9e32..0fce0bc1a957 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1645,20 +1645,14 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         }
 
         ret = -ENOMEM;
-        cc->io_queue = alloc_workqueue("kcryptd_io",
-                                       WQ_NON_REENTRANT|
-                                       WQ_MEM_RECLAIM,
-                                       1);
+        cc->io_queue = alloc_workqueue("kcryptd_io", WQ_MEM_RECLAIM, 1);
         if (!cc->io_queue) {
                 ti->error = "Couldn't create kcryptd io queue";
                 goto bad;
         }
 
         cc->crypt_queue = alloc_workqueue("kcryptd",
-                                          WQ_NON_REENTRANT|
-                                          WQ_CPU_INTENSIVE|
-                                          WQ_MEM_RECLAIM,
-                                          1);
+                                          WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM, 1);
         if (!cc->crypt_queue) {
                 ti->error = "Couldn't create kcryptd queue";
                 goto bad;
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index d581fe5d2faf..3a7cade5e27d 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -833,8 +833,7 @@ struct dm_kcopyd_client *dm_kcopyd_client_create(struct dm_kcopyd_throttle *thro
                 goto bad_slab;
 
         INIT_WORK(&kc->kcopyd_work, do_work);
-        kc->kcopyd_wq = alloc_workqueue("kcopyd",
-                                        WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
+        kc->kcopyd_wq = alloc_workqueue("kcopyd", WQ_MEM_RECLAIM, 0);
         if (!kc->kcopyd_wq)
                 goto bad_workqueue;
 
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 699b5be68d31..9584443c5614 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -1080,8 +1080,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         ti->per_bio_data_size = sizeof(struct dm_raid1_bio_record);
         ti->discard_zeroes_data_unsupported = true;
 
-        ms->kmirrord_wq = alloc_workqueue("kmirrord",
-                                          WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
+        ms->kmirrord_wq = alloc_workqueue("kmirrord", WQ_MEM_RECLAIM, 0);
         if (!ms->kmirrord_wq) {
                 DMERR("couldn't start kmirrord");
                 r = -ENOMEM;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 9e39d2b64bf8..ef095a96d039 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1946,8 +1946,7 @@ static struct mapped_device *alloc_dev(int minor)
         add_disk(md->disk);
         format_dev_t(md->name, MKDEV(_major, minor));
 
-        md->wq = alloc_workqueue("kdmflush",
-                                 WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
+        md->wq = alloc_workqueue("kdmflush", WQ_MEM_RECLAIM, 0);
         if (!md->wq)
                 goto bad_thread;