* [Qemu-devel] [PATCH] rbd: make the code better readable
@ 2016-10-14 9:51 Xiubo Li
2016-10-14 19:28 ` [Qemu-devel] [Qemu-block] " John Snow
0 siblings, 1 reply; 3+ messages in thread
From: Xiubo Li @ 2016-10-14 9:51 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel, Xiubo Li
Make it a bit clear and better readable.
Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com>
---
block/rbd.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 0a5840d..de8ca1b 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -366,45 +366,45 @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
rados_conf_read_file(cluster, NULL);
} else if (conf[0] != '\0' &&
qemu_rbd_set_conf(cluster, conf, true, &local_err) < 0) {
- rados_shutdown(cluster);
error_propagate(errp, local_err);
- return -EIO;
+ ret = -EIO;
+ goto failed_shutdown;
}
if (conf[0] != '\0' &&
qemu_rbd_set_conf(cluster, conf, false, &local_err) < 0) {
- rados_shutdown(cluster);
error_propagate(errp, local_err);
- return -EIO;
+ ret = -EIO;
+ goto failed_shutdown;
}
if (qemu_rbd_set_auth(cluster, secretid, errp) < 0) {
rados_shutdown(cluster);
- return -EIO;
+ ret = -EIO;
+ goto failed_shutdown;
}
ret = rados_connect(cluster);
if (ret < 0) {
error_setg_errno(errp, -ret, "error connecting");
- rados_shutdown(cluster);
- return ret;
+ goto failed_shutdown;
}
ret = rados_ioctx_create(cluster, pool, &io_ctx);
if (ret < 0) {
error_setg_errno(errp, -ret, "error opening pool %s", pool);
- rados_shutdown(cluster);
- return ret;
+ goto failed_shutdown;
}
ret = rbd_create(io_ctx, name, bytes, &obj_order);
- rados_ioctx_destroy(io_ctx);
- rados_shutdown(cluster);
if (ret < 0) {
error_setg_errno(errp, -ret, "error rbd create");
- return ret;
}
+ rados_ioctx_destroy(io_ctx);
+
+failed_shutdown:
+ rados_shutdown(cluster);
return ret;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH] rbd: make the code better readable
2016-10-14 9:51 [Qemu-devel] [PATCH] rbd: make the code better readable Xiubo Li
@ 2016-10-14 19:28 ` John Snow
2016-10-14 23:51 ` 李秀波
0 siblings, 1 reply; 3+ messages in thread
From: John Snow @ 2016-10-14 19:28 UTC (permalink / raw)
To: Xiubo Li, qemu-block; +Cc: qemu-devel
On 10/14/2016 05:51 AM, Xiubo Li wrote:
> Make it a bit clear and better readable.
>
Suggestion: "Make it clearer and more readable."
> Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com>
> ---
> block/rbd.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/block/rbd.c b/block/rbd.c
> index 0a5840d..de8ca1b 100644
> --- a/block/rbd.c
> +++ b/block/rbd.c
> @@ -366,45 +366,45 @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
> rados_conf_read_file(cluster, NULL);
> } else if (conf[0] != '\0' &&
> qemu_rbd_set_conf(cluster, conf, true, &local_err) < 0) {
> - rados_shutdown(cluster);
> error_propagate(errp, local_err);
> - return -EIO;
> + ret = -EIO;
> + goto failed_shutdown;
> }
>
> if (conf[0] != '\0' &&
> qemu_rbd_set_conf(cluster, conf, false, &local_err) < 0) {
> - rados_shutdown(cluster);
> error_propagate(errp, local_err);
> - return -EIO;
> + ret = -EIO;
> + goto failed_shutdown;
> }
>
> if (qemu_rbd_set_auth(cluster, secretid, errp) < 0) {
> rados_shutdown(cluster);
Did you mean to remove rados_shutdown() here, too?
> - return -EIO;
> + ret = -EIO;
> + goto failed_shutdown;
> }
>
> ret = rados_connect(cluster);
> if (ret < 0) {
> error_setg_errno(errp, -ret, "error connecting");
> - rados_shutdown(cluster);
> - return ret;
> + goto failed_shutdown;
> }
>
> ret = rados_ioctx_create(cluster, pool, &io_ctx);
> if (ret < 0) {
> error_setg_errno(errp, -ret, "error opening pool %s", pool);
> - rados_shutdown(cluster);
> - return ret;
> + goto failed_shutdown;
> }
>
> ret = rbd_create(io_ctx, name, bytes, &obj_order);
> - rados_ioctx_destroy(io_ctx);
> - rados_shutdown(cluster);
> if (ret < 0) {
> error_setg_errno(errp, -ret, "error rbd create");
> - return ret;
> }
>
> + rados_ioctx_destroy(io_ctx);
> +
> +failed_shutdown:
Since this executes on the non-error pathway too, I might just call this
'shutdown'.
> + rados_shutdown(cluster);
> return ret;
> }
>
>
--
—js
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH] rbd: make the code better readable
2016-10-14 19:28 ` [Qemu-devel] [Qemu-block] " John Snow
@ 2016-10-14 23:51 ` 李秀波
0 siblings, 0 replies; 3+ messages in thread
From: 李秀波 @ 2016-10-14 23:51 UTC (permalink / raw)
To: JohnSnow, qemu-block; +Cc: qemu-devel
JohnSnow <jsnow@redhat.com>写到：
>
>
>On 10/14/2016 05:51 AM, Xiubo Li wrote:
>> Make it a bit clear and better readable.
>>
>
>Suggestion: "Make it clearer and more readable."
>
Yes, see the next version.
>>
>> if (qemu_rbd_set_auth(cluster, secretid, errp) < 0) {
>> rados_shutdown(cluster);
>
>Did you mean to remove rados_shutdown() here, too?
>
I will fix this.
>> ret = rbd_create(io_ctx, name, bytes, &obj_order);
>> - rados_ioctx_destroy(io_ctx);
>> - rados_shutdown(cluster);
>> if (ret < 0) {
>> error_setg_errno(errp, -ret, "error rbd create");
>> - return ret;
>> }
>>
>> + rados_ioctx_destroy(io_ctx);
>> +
>> +failed_shutdown:
>
>Since this executes on the non-error pathway too, I might just call
>this
>'shutdown'.
>
Agree.
Thanks very much.
BRS
Xiubo
>> + rados_shutdown(cluster);
>> return ret;
>> }
>>
>>
>
>--
>梛s
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-14 23:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-14 9:51 [Qemu-devel] [PATCH] rbd: make the code better readable Xiubo Li
2016-10-14 19:28 ` [Qemu-devel] [Qemu-block] " John Snow
2016-10-14 23:51 ` 李秀波
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).