remove redundant _fio_rbd_disconnect, which is already called in
authorPan Liu <wanjun.lp@alibaba-inc.com>
Wed, 3 May 2017 11:20:14 +0000 (19:20 +0800)
committerPan Liu <wanjun.lp@alibaba-inc.com>
Wed, 3 May 2017 11:20:14 +0000 (19:20 +0800)
fio_rbd_cleaup

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
engines/rbd.c

index 8eeef53b119c1d1255c93beab39804d859545a59..279b314a8c84c458544c0a915a1bb213bba75fdc 100644 (file)
@@ -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");
        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;
        } 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);
        }
 
        dprint(FD_IO, "rbd-engine: image size: %lu\n", info.size);
@@ -620,8 +620,6 @@ static int fio_rbd_setup(struct thread_data *td)
 
        return 0;
 
 
        return 0;
 
-disconnect:
-       _fio_rbd_disconnect(rbd);
 cleanup:
        fio_rbd_cleanup(td);
        return r;
 cleanup:
        fio_rbd_cleanup(td);
        return r;