* [PATCH -next] rbd: fix error return code in rbd_dev_device_setup()
@ 2014-08-14 0:56 weiyj_lk
2014-08-14 2:42 ` Alex Elder
0 siblings, 1 reply; 3+ messages in thread
From: weiyj_lk @ 2014-08-14 0:56 UTC (permalink / raw)
To: Yehuda Sadeh, Sage Weil, Alex Elder, Ilya Dryomov; +Cc: Wei Yongjun, ceph-devel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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 <yongjun_wei@trendmicro.com.cn>
---
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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] rbd: fix error return code in rbd_dev_device_setup()
2014-08-14 0:56 [PATCH -next] rbd: fix error return code in rbd_dev_device_setup() weiyj_lk
@ 2014-08-14 2:42 ` Alex Elder
2014-08-14 3:50 ` Sage Weil
0 siblings, 1 reply; 3+ messages in thread
From: Alex Elder @ 2014-08-14 2:42 UTC (permalink / raw)
To: weiyj_lk, Yehuda Sadeh, Sage Weil, Alex Elder, Ilya Dryomov
Cc: Wei Yongjun, ceph-devel
On 08/13/2014 07:56 PM, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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 <yongjun_wei@trendmicro.com.cn>
This looks good to me. Sorry I missed this when I first
reviewed the workqueue code.
Reviewed-by: Alex Elder <elder@linaro.org>
> ---
> 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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] rbd: fix error return code in rbd_dev_device_setup()
2014-08-14 2:42 ` Alex Elder
@ 2014-08-14 3:50 ` Sage Weil
0 siblings, 0 replies; 3+ messages in thread
From: Sage Weil @ 2014-08-14 3:50 UTC (permalink / raw)
To: Alex Elder
Cc: weiyj_lk, Yehuda Sadeh, Alex Elder, Ilya Dryomov, Wei Yongjun,
ceph-devel
Applied. Thanks!
On Wed, 13 Aug 2014, Alex Elder wrote:
> On 08/13/2014 07:56 PM, weiyj_lk@163.com wrote:
> > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> >
> > 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 <yongjun_wei@trendmicro.com.cn>
>
> This looks good to me. Sorry I missed this when I first
> reviewed the workqueue code.
>
> Reviewed-by: Alex Elder <elder@linaro.org>
>
>
> > ---
> > 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
> >
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-14 3:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-14 0:56 [PATCH -next] rbd: fix error return code in rbd_dev_device_setup() weiyj_lk
2014-08-14 2:42 ` Alex Elder
2014-08-14 3:50 ` Sage Weil
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.