Browse Source

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>
Ilya Dryomov 11 years ago
parent
commit
91883cd27c
1 changed files with 5 additions and 10 deletions
  1. 5 10
      net/ceph/osd_client.c

+ 5 - 10
net/ceph/osd_client.c

@@ -2358,24 +2358,19 @@ static void handle_watch_notify(struct ceph_osd_client *osdc,
 	if (event) {
 	if (event) {
 		event_work = kmalloc(sizeof(*event_work), GFP_NOIO);
 		event_work = kmalloc(sizeof(*event_work), GFP_NOIO);
 		if (!event_work) {
 		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);
 		INIT_WORK(&event_work->work, do_event_work);
 		event_work->event = event;
 		event_work->event = event;
 		event_work->ver = ver;
 		event_work->ver = ver;
 		event_work->notify_id = notify_id;
 		event_work->notify_id = notify_id;
 		event_work->opcode = opcode;
 		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;
 	return;
 
 
 bad:
 bad: