[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 02/14] rbd: make the code more readable
From: |
Jeff Cody |
Subject: |
[Qemu-block] [PULL 02/14] rbd: make the code more readable |
Date: |
Mon, 31 Oct 2016 15:22:49 -0400 |
From: Xiubo Li <address@hidden>
Make it a bit clearer and more readable.
Signed-off-by: Xiubo Li <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Message-id: address@hidden
CC: John Snow <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
---
block/rbd.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index f6e1d4b..a57b3e3 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -365,45 +365,44 @@ 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 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 shutdown;
}
if (qemu_rbd_set_auth(cluster, secretid, errp) < 0) {
- rados_shutdown(cluster);
- return -EIO;
+ ret = -EIO;
+ goto shutdown;
}
ret = rados_connect(cluster);
if (ret < 0) {
error_setg_errno(errp, -ret, "error connecting");
- rados_shutdown(cluster);
- return ret;
+ goto 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 shutdown;
}
ret = rbd_create(io_ctx, name, bytes, &obj_order);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "error rbd create");
+ }
+
rados_ioctx_destroy(io_ctx);
+
+shutdown:
rados_shutdown(cluster);
- if (ret < 0) {
- error_setg_errno(errp, -ret, "error rbd create");
- return ret;
- }
-
return ret;
}
--
2.7.4
- [Qemu-block] [PULL 00/14] Block patches for 2.8, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 01/14] qapi: add release designator to gluster logfile option, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 02/14] rbd: make the code more readable,
Jeff Cody <=
- [Qemu-block] [PULL 03/14] block: add gluster ifdef guard checks for SEEK_DATA/SEEK_HOLE support, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 04/14] block/gluster: memory usage: use one glfs instance per volume, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 05/14] block: Turn on "unmap" in active commit, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 07/14] block/gluster: fix port type in the QAPI options list, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 06/14] block/gluster: improve defense over string to int conversion, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 08/14] blockjobs: hide internal jobs from management API, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 09/14] blockjobs: Allow creating internal jobs, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 10/14] Replication/Blockjobs: Create replication jobs as internal, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 12/14] Blockjobs: Internalize user_pause logic, Jeff Cody, 2016/10/31
- [Qemu-block] [PULL 11/14] blockjob: centralize QMP event emissions, Jeff Cody, 2016/10/31