Commit f9865f06 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Sage Weil

libceph: ceph-msgr workqueue needs a resque worker

Commit f363e45f ("net/ceph: make ceph_msgr_wq non-reentrant")
effectively removed WQ_MEM_RECLAIM flag from ceph_msgr_wq.  This is
wrong - libceph is very much a memory reclaim path, so restore it.

Cc: stable@vger.kernel.org # needs backporting for < 3.12
Signed-off-by: default avatarIlya Dryomov <idryomov@redhat.com>
Tested-by: default avatarMicha Krause <micha@krausam.de>
Reviewed-by: default avatarSage Weil <sage@redhat.com>
parent ab6c2c3e
...@@ -292,7 +292,11 @@ int ceph_msgr_init(void) ...@@ -292,7 +292,11 @@ int ceph_msgr_init(void)
if (ceph_msgr_slab_init()) if (ceph_msgr_slab_init())
return -ENOMEM; return -ENOMEM;
ceph_msgr_wq = alloc_workqueue("ceph-msgr", 0, 0); /*
* The number of active work items is limited by the number of
* connections, so leave @max_active at default.
*/
ceph_msgr_wq = alloc_workqueue("ceph-msgr", WQ_MEM_RECLAIM, 0);
if (ceph_msgr_wq) if (ceph_msgr_wq)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment