Commit dea8dcf2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm 

Pull device mapper fix from Mike Snitzer:
 "Revert WQ_SYSFS change that broke reencryption (and all other
  functionality that requires reloading a dm-crypt DM table)"

* tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  Revert "dm crypt: export sysfs of kcryptd workqueue"
parents c76e02c5 48b0777c

drivers/md/dm-crypt.c

+3 −4
Original line number Diff line number Diff line
@@ -3166,12 +3166,11 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	}



	if (test_bit(DM_CRYPT_SAME_CPU, &cc->flags))

		cc->crypt_queue = alloc_workqueue("kcryptd-%s", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM,

		cc->crypt_queue = alloc_workqueue("kcryptd/%s", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM,

						  1, devname);

	else

		cc->crypt_queue = alloc_workqueue("kcryptd-%s",

						  WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM |

						  WQ_UNBOUND | WQ_SYSFS,

		cc->crypt_queue = alloc_workqueue("kcryptd/%s",

						  WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND,

						  num_online_cpus(), devname);

	if (!cc->crypt_queue) {

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