[patch 3/2] libceph: create_singlethread_workqueue() doesn't return ERR_PTRs
From: Dan Carpenter <hidden>
Date: 2013-08-15 05:59:12
Also in:
ceph-devel, kernel-janitors
Subsystem:
ceph common code (libceph), the rest · Maintainers:
Ilya Dryomov, Alex Markuze, Viacheslav Dubeyko, Linus Torvalds
create_singlethread_workqueue() returns NULL on error, and it doesn't return ERR_PTRs. I tweaked the error handling a little to be consistent with earlier in the function. Signed-off-by: Dan Carpenter <redacted>
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index dbc0a73..02c5246 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c@@ -2257,12 +2257,10 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) if (err < 0) goto out_msgpool; + err = -ENOMEM; osdc->notify_wq = create_singlethread_workqueue("ceph-watch-notify"); - if (IS_ERR(osdc->notify_wq)) { - err = PTR_ERR(osdc->notify_wq); - osdc->notify_wq = NULL; + if (!osdc->notify_wq) goto out_msgpool; - } return 0; out_msgpool: