diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-15 07:58:59 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-27 21:26:31 +0200 |
| commit | dbcae088fa660086bde6e10d63bb3c9264832d85 (patch) | |
| tree | 7e79f60b71b7f826c39ba1f42ee4c00e4e1e7877 /net/ceph | |
| parent | libceph: potential NULL dereference in ceph_osdc_handle_map() (diff) | |
| download | linux-dbcae088fa660086bde6e10d63bb3c9264832d85.tar.xz linux-dbcae088fa660086bde6e10d63bb3c9264832d85.zip | |
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/ceph')
| -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) 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: |