lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 108/129] libceph: create_singlethread_workqueue() doesnt return ERR_PTRs
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    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>

    ---
    net/ceph/osd_client.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/net/ceph/osd_client.c
    +++ b/net/ceph/osd_client.c
    @@ -2257,12 +2257,10 @@ int ceph_osdc_init(struct ceph_osd_clien
    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:



    \
     
     \ /
      Last update: 2014-01-07 02:01    [W:2.110 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site