Return non-negtive error in order to print right error msg

[fio.git] / engines / rbd.c

diff --git a/engines/rbd.c b/engines/rbd.c
index ee7a7cd4cbb4680a43eebee5c59535a27fdf593b..743387925e699ff871758b91882b46421ad51a6f 100644 (file)
--- a/engines/rbd.c
+++ b/engines/rbd.c
@@ -290,7 +290,7 @@ static void _fio_rbd_finish_aiocb(rbd_completion_t comp, void *data)
         */
        ret = rbd_aio_get_return_value(fri->completion);
        if (ret < 0) {
-               io_u->error = ret;
+               io_u->error = -ret;
                io_u->resid = io_u->xfer_buflen;
        } else
                io_u->error = 0;
@@ -524,7 +524,7 @@ static int fio_rbd_queue(struct thread_data *td, struct io_u *io_u)
 failed_comp:
        rbd_aio_release(fri->completion);
 failed:
-       io_u->error = r;
+       io_u->error = -r;
        td_verror(td, io_u->error, "xfer");
        return FIO_Q_COMPLETED;
 }
@@ -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) {