diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-15 08:58:59 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 12:24:25 -0800 |
| commit | 3834fb30d260b8fa6401fff271c65cd29ba94424 (patch) | |
| tree | ce82151ec76058d997b90c611ea82464e217642c /net/ceph | |
| parent | 53341d7de3f013cc39a3692bdfd02032ce722dff (diff) | |
| download | linux-3.10-3834fb30d260b8fa6401fff271c65cd29ba94424.tar.gz linux-3.10-3834fb30d260b8fa6401fff271c65cd29ba94424.tar.bz2 linux-3.10-3834fb30d260b8fa6401fff271c65cd29ba94424.zip | |
libceph: create_singlethread_workqueue() doesn't return ERR_PTRs
commit dbcae088fa660086bde6e10d63bb3c9264832d85 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 311161eac5c..ac34cb5120e 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: |