diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2016-04-28 16:07:24 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-05-26 00:36:28 +0200 |
| commit | b37ee1b9b840a6da63e78865f97a9a78b7534477 (patch) | |
| tree | 7fb861b2779b2e9e83af367a0f33a4b3893e3258 | |
| parent | fe5da05e979830b43b115d8a18ead521d507c783 (diff) | |
| download | linux-stable-b37ee1b9b840a6da63e78865f97a9a78b7534477.tar.gz linux-stable-b37ee1b9b840a6da63e78865f97a9a78b7534477.tar.bz2 linux-stable-b37ee1b9b840a6da63e78865f97a9a78b7534477.zip | |
libceph: move schedule_delayed_work() in ceph_osdc_init()
ceph_osdc_stop() isn't called if ceph_osdc_init() fails, so we end up
with handle_osds_timeout() running on invalid memory if any one of the
allocations fails. Call schedule_delayed_work() after everything is
setup, just before returning.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
| -rw-r--r-- | net/ceph/osd_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index baf2844b00d6..4c7231e55cb7 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2729,9 +2729,6 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) osdc->event_tree = RB_ROOT; osdc->event_count = 0; - schedule_delayed_work(&osdc->osds_timeout_work, - round_jiffies_relative(osdc->client->options->osd_idle_ttl)); - err = -ENOMEM; osdc->req_mempool = mempool_create_slab_pool(10, ceph_osd_request_cache); @@ -2752,6 +2749,9 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) if (!osdc->notify_wq) goto out_msgpool_reply; + schedule_delayed_work(&osdc->osds_timeout_work, + round_jiffies_relative(osdc->client->options->osd_idle_ttl)); + return 0; out_msgpool_reply: |