From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Elder Subject: Re: [PATCH -next] rbd: fix error return code in rbd_dev_device_setup() Date: Wed, 13 Aug 2014 21:42:15 -0500 Message-ID: <53EC2207.1070409@ieee.org> References: <1407977768-15119-1-git-send-email-weiyj_lk@163.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ig0-f180.google.com ([209.85.213.180]:41501 "EHLO mail-ig0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753689AbaHNCmT (ORCPT ); Wed, 13 Aug 2014 22:42:19 -0400 Received: by mail-ig0-f180.google.com with SMTP id l13so3692928iga.13 for ; Wed, 13 Aug 2014 19:42:19 -0700 (PDT) In-Reply-To: <1407977768-15119-1-git-send-email-weiyj_lk@163.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: weiyj_lk@163.com, Yehuda Sadeh , Sage Weil , Alex Elder , Ilya Dryomov Cc: Wei Yongjun , ceph-devel@vger.kernel.org On 08/13/2014 07:56 PM, weiyj_lk@163.com wrote: > From: Wei Yongjun > > Fix to return -ENOMEM from the workqueue alloc error handling > case instead of 0, as done elsewhere in this function. > > Signed-off-by: Wei Yongjun This looks good to me. Sorry I missed this when I first reviewed the workqueue code. Reviewed-by: Alex Elder > --- > drivers/block/rbd.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index 623c841..f3be022 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -5088,8 +5087,10 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev) > set_disk_ro(rbd_dev->disk, rbd_dev->mapping.read_only); > > rbd_dev->rq_wq = alloc_workqueue(rbd_dev->disk->disk_name, 0, 0); > - if (!rbd_dev->rq_wq) > + if (!rbd_dev->rq_wq) { > + ret = -ENOMEM; > goto err_out_mapping; > + } > > ret = rbd_bus_add_dev(rbd_dev); > if (ret) > > -- > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >