Merge branch 'wip-remove-disconnect' of https://github.com/liupan1111/fio

[fio.git] / engines / rbd.c

diff --git a/engines/rbd.c b/engines/rbd.c
index 743387925e699ff871758b91882b46421ad51a6f..4bae425cb3d088efb4b926582b550324a19b178d 100644 (file)
--- a/engines/rbd.c
+++ b/engines/rbd.c
@@ -597,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);
@@ -618,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;