]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
libceph: create_singlethread_workqueue() doesn't return ERR_PTRs
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 15 Aug 2013 05:58:59 +0000 (08:58 +0300)
committerSage Weil <sage@inktank.com>
Tue, 27 Aug 2013 19:26:31 +0000 (12:26 -0700)
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>
net/ceph/osd_client.c

index 6a59fb8fc999a3660ce9add800dcec8c6b7e345d..1606f740d6ae0d1b7ea8aeb1ba8126fd7693888d 100644 (file)
@@ -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: