diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-31 17:49:22 +0200 |
|---|---|---|
| committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-02-03 19:20:59 +0200 |
| commit | c172ec5c8dc8c09dd5958f4ae542fa321bb15a92 (patch) | |
| tree | 5eaa074d38b7518225ed4e82f35b399fe13c317a /net/ceph | |
| parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) | |
| download | linux-c172ec5c8dc8c09dd5958f4ae542fa321bb15a92.tar.gz linux-c172ec5c8dc8c09dd5958f4ae542fa321bb15a92.tar.bz2 linux-c172ec5c8dc8c09dd5958f4ae542fa321bb15a92.zip | |
libceph: fix error handling in ceph_osdc_init()
msgpool_op_reply message pool isn't destroyed if workqueue construction
fails. Fix it.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osd_client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 010ff3bd58ad..166d4c7ba065 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2504,9 +2504,12 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) err = -ENOMEM; osdc->notify_wq = create_singlethread_workqueue("ceph-watch-notify"); if (!osdc->notify_wq) - goto out_msgpool; + goto out_msgpool_reply; + return 0; +out_msgpool_reply: + ceph_msgpool_destroy(&osdc->msgpool_op_reply); out_msgpool: ceph_msgpool_destroy(&osdc->msgpool_op); out_mempool: |