Skip to content

Commit dea8dcf

Browse files
committed
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"
2 parents c76e02c + 48b0777 commit dea8dcf

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/md/dm-crypt.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3166,12 +3166,11 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
31663166
}
31673167

31683168
if (test_bit(DM_CRYPT_SAME_CPU, &cc->flags))
3169-
cc->crypt_queue = alloc_workqueue("kcryptd-%s", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM,
3169+
cc->crypt_queue = alloc_workqueue("kcryptd/%s", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM,
31703170
1, devname);
31713171
else
3172-
cc->crypt_queue = alloc_workqueue("kcryptd-%s",
3173-
WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM |
3174-
WQ_UNBOUND | WQ_SYSFS,
3172+
cc->crypt_queue = alloc_workqueue("kcryptd/%s",
3173+
WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND,
31753174
num_online_cpus(), devname);
31763175
if (!cc->crypt_queue) {
31773176
ti->error = "Couldn't create kcryptd queue";

0 commit comments

Comments
 (0)