diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-09-11 12:18:53 +0400 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@redhat.com> | 2014-10-14 21:03:25 +0400 |
| commit | 91883cd27c4e2523dd53e2bd6f71a1c5e0be5a38 (patch) | |
| tree | 2c3a8935d1967fa5d7c91ab4ba82d90e8b49f316 | |
| parent | 03974e8177b36d672eb59658f976f03cb77c1129 (diff) | |
libceph: don't try checking queue_work() return value
queue_work() doesn't "fail to queue", it returns false if work was
already on a queue, which can't happen here since we allocate
event_work right before we queue it. So don't bother at all.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
| -rw-r--r-- | net/ceph/osd_client.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 01aeddf28469..a528ea34253a 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2358,24 +2358,19 @@ static void handle_watch_notify(struct ceph_osd_client *osdc, if (event) { event_work = kmalloc(sizeof(*event_work), GFP_NOIO); if (!event_work) { - dout("ERROR: could not allocate event_work\n"); - goto done_err; + pr_err("couldn't allocate event_work\n"); + ceph_osdc_put_event(event); + return; } INIT_WORK(&event_work->work, do_event_work); event_work->event = event; event_work->ver = ver; event_work->notify_id = notify_id; event_work->opcode = opcode; - if (!queue_work(osdc->notify_wq, &event_work->work)) { - dout("WARNING: failed to queue notify event work\n"); - goto done_err; - } - } - return; + queue_work(osdc->notify_wq, &event_work->work); + } -done_err: - ceph_osdc_put_event(event); return; bad: |