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

Commit 670368a8 authored by Tejun Heo's avatar Tejun Heo Committed by Mike Snitzer
Browse files

dm: stop using WQ_NON_REENTRANT 



dbf2576e ("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: 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>
Acked-by: default avatarJoe Thornber <ejt@redhat.com>
parent b936bf8b

drivers/md/dm-crypt.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -1645,20 +1645,14 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	}

	}





	ret = -ENOMEM;

	ret = -ENOMEM;

	cc->io_queue = alloc_workqueue("kcryptd_io",

	cc->io_queue = alloc_workqueue("kcryptd_io", WQ_MEM_RECLAIM, 1);

				       WQ_NON_REENTRANT|

				       WQ_MEM_RECLAIM,

				       1);

	if (!cc->io_queue) {

	if (!cc->io_queue) {

		ti->error = "Couldn't create kcryptd io queue";

		ti->error = "Couldn't create kcryptd io queue";

		goto bad;

		goto bad;

	}

	}





	cc->crypt_queue = alloc_workqueue("kcryptd",

	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) {

	if (!cc->crypt_queue) {

		ti->error = "Couldn't create kcryptd queue";

		ti->error = "Couldn't create kcryptd queue";

		goto bad;

		goto bad;

drivers/md/dm-kcopyd.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -833,8 +833,7 @@ struct dm_kcopyd_client *dm_kcopyd_client_create(struct dm_kcopyd_throttle *thro 
		goto bad_slab;

		goto bad_slab;





	INIT_WORK(&kc->kcopyd_work, do_work);

	INIT_WORK(&kc->kcopyd_work, do_work);

	kc->kcopyd_wq = alloc_workqueue("kcopyd",

	kc->kcopyd_wq = alloc_workqueue("kcopyd", WQ_MEM_RECLAIM, 0);

					WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);

	if (!kc->kcopyd_wq)

	if (!kc->kcopyd_wq)

		goto bad_workqueue;

		goto bad_workqueue;

drivers/md/dm-raid1.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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->per_bio_data_size = sizeof(struct dm_raid1_bio_record);

	ti->discard_zeroes_data_unsupported = true;

	ti->discard_zeroes_data_unsupported = true;





	ms->kmirrord_wq = alloc_workqueue("kmirrord",

	ms->kmirrord_wq = alloc_workqueue("kmirrord", WQ_MEM_RECLAIM, 0);

					  WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);

	if (!ms->kmirrord_wq) {

	if (!ms->kmirrord_wq) {

		DMERR("couldn't start kmirrord");

		DMERR("couldn't start kmirrord");

		r = -ENOMEM;

		r = -ENOMEM;

drivers/md/dm.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1946,8 +1946,7 @@ static struct mapped_device *alloc_dev(int minor) 
	add_disk(md->disk);

	add_disk(md->disk);

	format_dev_t(md->name, MKDEV(_major, minor));

	format_dev_t(md->name, MKDEV(_major, minor));





	md->wq = alloc_workqueue("kdmflush",

	md->wq = alloc_workqueue("kdmflush", WQ_MEM_RECLAIM, 0);

				 WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);

	if (!md->wq)

	if (!md->wq)

		goto bad_thread;

		goto bad_thread;