diff options
| author | Ilya Dryomov <idryomov@redhat.com> | 2014-10-10 16:39:05 +0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-12-14 16:23:48 +0000 |
| commit | d2e594f2017011400253a62adc7352f02204d1dd (patch) | |
| tree | f7f35494058a43b2977211a0f51ec84f92f4b2bf /net/ceph | |
| parent | 9aaf9678ea3ea80416fa5c8f389f76c497038d89 (diff) | |
| download | kernel_samsung_smdk4412-d2e594f2017011400253a62adc7352f02204d1dd.zip kernel_samsung_smdk4412-d2e594f2017011400253a62adc7352f02204d1dd.tar.gz kernel_samsung_smdk4412-d2e594f2017011400253a62adc7352f02204d1dd.tar.bz2 | |
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>
[bwh: Backported to 3.2:
- Keep passing the WQ_NON_REENTRANT flag too
- Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/messenger.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 7a239f0..e85a8d2 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -99,7 +99,12 @@ struct workqueue_struct *ceph_msgr_wq; int ceph_msgr_init(void) { - ceph_msgr_wq = alloc_workqueue("ceph-msgr", WQ_NON_REENTRANT, 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_NON_REENTRANT | WQ_MEM_RECLAIM, 0); if (!ceph_msgr_wq) { pr_err("msgr_init failed to create workqueue\n"); return -ENOMEM; |