diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-03-08 21:19:12 +0000 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-03-08 21:19:52 +0000 |
| commit | 9f5ef4b3ad75cb7bda0967b3e37eca2d0b634a02 (patch) | |
| tree | 2aee9799ae69c9cc9f36d8d929c9469292ec016f | |
| parent | bf519936d5925b859232cdb26b03c664dd59eb82 (diff) | |
Revert "ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue"
This reverts commit 46050a93ff9e13fddcdcaff35e2b0b863b3af69b.
Change-Id: I3e37cf37c9ea0270737608dcd92ab5c311ea5ab8
| -rw-r--r-- | drivers/md/dm-crypt.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 855600410064..3147c8d09ea8 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1864,25 +1864,16 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) } ret = -ENOMEM; - cc->io_queue = alloc_workqueue("kcryptd_io", - WQ_HIGHPRI | - 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; } if (test_bit(DM_CRYPT_SAME_CPU, &cc->flags)) - cc->crypt_queue = alloc_workqueue("kcryptd", - WQ_HIGHPRI | - WQ_MEM_RECLAIM, 1); + cc->crypt_queue = alloc_workqueue("kcryptd", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM, 1); else - cc->crypt_queue = alloc_workqueue("kcryptd", - WQ_HIGHPRI | - WQ_MEM_RECLAIM | - WQ_UNBOUND, + cc->crypt_queue = alloc_workqueue("kcryptd", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND, num_online_cpus()); if (!cc->crypt_queue) { ti->error = "Couldn't create kcryptd queue"; |