Skip to content

Commit

Permalink
libceph: ceph-msgr workqueue needs a resque worker
Browse files Browse the repository at this point in the history
Commit f363e45 ("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>
  • Loading branch information
Ilya Dryomov authored and Sage Weil committed Oct 14, 2014
1 parent ab6c2c3 commit f9865f0
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion net/ceph/messenger.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit f9865f0

Please sign in to comment.