diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-15 01:58:59 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-27 15:26:31 -0400 |
commit | dbcae088fa660086bde6e10d63bb3c9264832d85 (patch) | |
tree | 7e79f60b71b7f826c39ba1f42ee4c00e4e1e7877 /net | |
parent | b72e19b9225d4297a18715b0998093d843d170fa (diff) |
libceph: create_singlethread_workqueue() doesn't return ERR_PTRs
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 <dan.carpenter@oracle.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/osd_client.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 6a59fb8fc999..1606f740d6ae 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -2264,12 +2264,10 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) | |||
2264 | if (err < 0) | 2264 | if (err < 0) |
2265 | goto out_msgpool; | 2265 | goto out_msgpool; |
2266 | 2266 | ||
2267 | err = -ENOMEM; | ||
2267 | osdc->notify_wq = create_singlethread_workqueue("ceph-watch-notify"); | 2268 | osdc->notify_wq = create_singlethread_workqueue("ceph-watch-notify"); |
2268 | if (IS_ERR(osdc->notify_wq)) { | 2269 | if (!osdc->notify_wq) |
2269 | err = PTR_ERR(osdc->notify_wq); | ||
2270 | osdc->notify_wq = NULL; | ||
2271 | goto out_msgpool; | 2270 | goto out_msgpool; |
2272 | } | ||
2273 | return 0; | 2271 | return 0; |
2274 | 2272 | ||
2275 | out_msgpool: | 2273 | out_msgpool: |