remove redundant _fio_rbd_disconnect, which is already called in

[fio.git] / engines / rbd.c

diff --git a/engines/rbd.c b/engines/rbd.c
index ee7a7cd4cbb4680a43eebee5c59535a27fdf593b..279b314a8c84c458544c0a915a1bb213bba75fdc 100644 (file)
--- a/engines/rbd.c
+++ b/engines/rbd.c
@@ -533,9 +533,9 @@ static int fio_rbd_init(struct thread_data *td)
 {
        int r;
        struct rbd_data *rbd = td->io_ops_data;
-       if (rbd->connected) {
+
+       if (rbd->connected)
                return 0;
-       }
 
        r = _fio_rbd_connect(td);
        if (r) {
@@ -566,13 +566,8 @@ static int fio_rbd_setup(struct thread_data *td)
        rbd_image_info_t info;
        struct fio_file *f;
        struct rbd_data *rbd = NULL;
-       int major, minor, extra;
        int r;
 
-       /* log version of librbd. No cluster connection required. */
-       rbd_version(&major, &minor, &extra);
-       log_info("rbd engine: RBD version: %d.%d.%d\n", major, minor, extra);
-
        /* allocate engine specific structure to deal with librbd. */
        r = _fio_setup_rbd_data(td, &rbd);
        if (r) {
@@ -602,11 +597,11 @@ static int fio_rbd_setup(struct thread_data *td)
        r = rbd_stat(rbd->image, &info, sizeof(info));
        if (r < 0) {
                log_err("rbd_status failed.\n");
-               goto disconnect;
+               goto cleanup;
        } else if (info.size == 0) {
                log_err("image size should be larger than zero.\n");
                r = -EINVAL;
-               goto disconnect;
+               goto cleanup;
        }
 
        dprint(FD_IO, "rbd-engine: image size: %lu\n", info.size);
@@ -623,13 +618,8 @@ static int fio_rbd_setup(struct thread_data *td)
        f = td->files[0];
        f->real_file_size = info.size;
 
-       /* disconnect, then we were only connected to determine
-        * the size of the RBD.
-        */
        return 0;
 
-disconnect:
-       _fio_rbd_disconnect(rbd);
 cleanup:
        fio_rbd_cleanup(td);
        return r;