diff options
| author | Ilya Dryomov <idryomov@redhat.com> | 2014-10-10 16:39:05 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:48:01 -0800 |
| commit | f05c0daaf68e424d05d271c7fb2fbfd5750a315e (patch) | |
| tree | 25cd9204376d2fa9166783d69283a10b7637554d /net | |
| parent | 58f382ffaf2570032da636a348aa6c045a166f4e (diff) | |
| download | linux-3.10-f05c0daaf68e424d05d271c7fb2fbfd5750a315e.tar.gz linux-3.10-f05c0daaf68e424d05d271c7fb2fbfd5750a315e.tar.bz2 linux-3.10-f05c0daaf68e424d05d271c7fb2fbfd5750a315e.zip | |
libceph: ceph-msgr workqueue needs a resque worker
commit f9865f06f7f18c6661c88d0511f05c48612319cc upstream.
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.
Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Tested-by: Micha Krause <micha@krausam.de>
Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/messenger.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 66e77f380fc..e3bea2e0821 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -290,7 +290,8 @@ int ceph_msgr_init(void) if (ceph_msgr_slab_init()) return -ENOMEM; - ceph_msgr_wq = alloc_workqueue("ceph-msgr", WQ_NON_REENTRANT, 0); + ceph_msgr_wq = alloc_workqueue("ceph-msgr", + WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0); if (ceph_msgr_wq) return 0; |