summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@redhat.com>2014-10-10 16:39:05 +0400
committerSage Weil <sage@redhat.com>2014-10-14 12:57:04 -0700
commitf9865f06f7f18c6661c88d0511f05c48612319cc (patch)
treea15fd2449ec4e8e4f230bd4701d880e3f0849960 /net
parentab6c2c3ebe1d4fddc1f9ae29810799419be950c0 (diff)
downloadop-kernel-dev-f9865f06f7f18c6661c88d0511f05c48612319cc.zip
op-kernel-dev-f9865f06f7f18c6661c88d0511f05c48612319cc.tar.gz
libceph: ceph-msgr workqueue needs a resque worker
Commit f363e45fd118 ("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: Ilya Dryomov <idryomov@redhat.com> Tested-by: Micha Krause <micha@krausam.de> Reviewed-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/messenger.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 9764c77..559c9f6 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -292,7 +292,11 @@ int ceph_msgr_init(void)
if (ceph_msgr_slab_init())
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)
return 0;
OpenPOWER on IntegriCloud