RDMA engine spelling fix: change FIO_RDMA_MAX_IO_DPETH into FIO_RDMA_MAX_IO_DEPTH

[fio.git] / engines / rdma.c

diff --git a/engines/rdma.c b/engines/rdma.c
index 2eeb897278e02f81e8ba7c8b35673dc8a95400ba..61a90b8a6dd9a6d912f993cc47c42bcc2e5e0e39 100644 (file)
--- a/engines/rdma.c
+++ b/engines/rdma.c
@@ -40,7 +40,7 @@
 #include <rdma/rdma_cma.h>
 #include <infiniband/arch.h>
 
-#define FIO_RDMA_MAX_IO_DPETH    128
+#define FIO_RDMA_MAX_IO_DEPTH    128
 
 enum rdma_io_mode {
        FIO_RDMA_UNKNOWN = 0,
@@ -61,7 +61,7 @@ struct rdma_info_blk {
        uint32_t nr;            /* client: io depth
                                   server: number of records for memory semantic
                                 */
-       struct remote_u rmt_us[FIO_RDMA_MAX_IO_DPETH];
+       struct remote_u rmt_us[FIO_RDMA_MAX_IO_DEPTH];
 };
 
 struct rdma_io_u_data {
@@ -114,7 +114,7 @@ static int client_recv(struct thread_data *td, struct ibv_wc *wc)
        struct rdmaio_data *rd = td->io_ops->data;
 
        if (wc->byte_len != sizeof(rd->recv_buf)) {
-               fprintf(stderr, "Received bogus data, size %d\n", wc->byte_len);
+               log_err("Received bogus data, size %d\n", wc->byte_len);
                return 1;
        }
 
@@ -145,7 +145,7 @@ static int server_recv(struct thread_data *td, struct ibv_wc *wc)
 {
        struct rdmaio_data *rd = td->io_ops->data;
 
-       if (wc->wr_id == FIO_RDMA_MAX_IO_DPETH) {
+       if (wc->wr_id == FIO_RDMA_MAX_IO_DEPTH) {
                rd->rdma_protocol = ntohl(rd->recv_buf.mode);
 
                /* CHANNEL semantic, do nothing */
@@ -183,7 +183,7 @@ static int cq_event_handler(struct thread_data *td, enum ibv_wc_opcode opcode)
                        else
                                server_recv(td, &wc);
 
-                       if (wc.wr_id == FIO_RDMA_MAX_IO_DPETH)
+                       if (wc.wr_id == FIO_RDMA_MAX_IO_DEPTH)
                                break;
 
                        for (i = 0; i < rd->io_u_flight_nr; i++) {
@@ -218,7 +218,7 @@ static int cq_event_handler(struct thread_data *td, enum ibv_wc_opcode opcode)
                case IBV_WC_SEND:
                case IBV_WC_RDMA_WRITE:
                case IBV_WC_RDMA_READ:
-                       if (wc.wr_id == FIO_RDMA_MAX_IO_DPETH)
+                       if (wc.wr_id == FIO_RDMA_MAX_IO_DEPTH)
                                break;
 
                        for (i = 0; i < rd->io_u_flight_nr; i++) {
@@ -405,7 +405,7 @@ static int fio_rdmaio_setup_control_msg_buffers(struct thread_data *td)
        rd->recv_sgl.lkey = rd->recv_mr->lkey;
        rd->rq_wr.sg_list = &rd->recv_sgl;
        rd->rq_wr.num_sge = 1;
-       rd->rq_wr.wr_id = FIO_RDMA_MAX_IO_DPETH;
+       rd->rq_wr.wr_id = FIO_RDMA_MAX_IO_DEPTH;
 
        /* send wq */
        rd->send_sgl.addr = (uint64_t) (unsigned long)&rd->send_buf;
@@ -416,7 +416,7 @@ static int fio_rdmaio_setup_control_msg_buffers(struct thread_data *td)
        rd->sq_wr.send_flags = IBV_SEND_SIGNALED;
        rd->sq_wr.sg_list = &rd->send_sgl;
        rd->sq_wr.num_sge = 1;
-       rd->sq_wr.wr_id = FIO_RDMA_MAX_IO_DPETH;
+       rd->sq_wr.wr_id = FIO_RDMA_MAX_IO_DEPTH;
 
        return 0;
 }
@@ -602,8 +602,8 @@ static int fio_rdmaio_send(struct thread_data *td, struct io_u **io_us,
                        index = rand() % rd->rmt_nr;
                        r_io_u_d->sq_wr.opcode = IBV_WR_RDMA_WRITE;
                        r_io_u_d->sq_wr.wr.rdma.rkey = rd->rmt_us[index].rkey;
-                       r_io_u_d->sq_wr.wr.rdma.remote_addr =
-                           rd->rmt_us[index].buf;
+                       r_io_u_d->sq_wr.wr.rdma.remote_addr = \
+                               rd->rmt_us[index].buf;
                        r_io_u_d->sq_wr.sg_list->length = io_us[i]->buflen;
                        break;
                case FIO_RDMA_MEM_READ:
@@ -612,8 +612,8 @@ static int fio_rdmaio_send(struct thread_data *td, struct io_u **io_us,
                        index = rand() % rd->rmt_nr;
                        r_io_u_d->sq_wr.opcode = IBV_WR_RDMA_READ;
                        r_io_u_d->sq_wr.wr.rdma.rkey = rd->rmt_us[index].rkey;
-                       r_io_u_d->sq_wr.wr.rdma.remote_addr =
-                           rd->rmt_us[index].buf;
+                       r_io_u_d->sq_wr.wr.rdma.remote_addr = \
+                               rd->rmt_us[index].buf;
                        r_io_u_d->sq_wr.sg_list->length = io_us[i]->buflen;
                        break;
                case FIO_RDMA_CHA_SEND:
@@ -1087,9 +1087,9 @@ static int fio_rdmaio_init(struct thread_data *td)
        if ((rd->rdma_protocol == FIO_RDMA_MEM_WRITE) ||
            (rd->rdma_protocol == FIO_RDMA_MEM_READ)) {
                rd->rmt_us =
-                   malloc(FIO_RDMA_MAX_IO_DPETH * sizeof(struct remote_u));
+                       malloc(FIO_RDMA_MAX_IO_DEPTH * sizeof(struct remote_u));
                memset(rd->rmt_us, 0,
-                      FIO_RDMA_MAX_IO_DPETH * sizeof(struct remote_u));
+                       FIO_RDMA_MAX_IO_DEPTH * sizeof(struct remote_u));
                rd->rmt_nr = 0;
        }
 
@@ -1184,19 +1184,19 @@ static int fio_rdmaio_setup(struct thread_data *td)
 }
 
 static struct ioengine_ops ioengine_rw = {
-       .name = "rdma",
-       .version = FIO_IOOPS_VERSION,
-       .setup = fio_rdmaio_setup,
-       .init = fio_rdmaio_init,
-       .prep = fio_rdmaio_prep,
-       .queue = fio_rdmaio_queue,
-       .commit = fio_rdmaio_commit,
-       .getevents = fio_rdmaio_getevents,
-       .event = fio_rdmaio_event,
-       .cleanup = fio_rdmaio_cleanup,
-       .open_file = fio_rdmaio_open_file,
-       .close_file = fio_rdmaio_close_file,
-       .flags = FIO_DISKLESSIO | FIO_UNIDIR | FIO_PIPEIO,
+       .name           = "rdma",
+       .version        = FIO_IOOPS_VERSION,
+       .setup          = fio_rdmaio_setup,
+       .init           = fio_rdmaio_init,
+       .prep           = fio_rdmaio_prep,
+       .queue          = fio_rdmaio_queue,
+       .commit         = fio_rdmaio_commit,
+       .getevents      = fio_rdmaio_getevents,
+       .event          = fio_rdmaio_event,
+       .cleanup        = fio_rdmaio_cleanup,
+       .open_file      = fio_rdmaio_open_file,
+       .close_file     = fio_rdmaio_close_file,
+       .flags          = FIO_DISKLESSIO | FIO_UNIDIR | FIO_PIPEIO,
 };
 
 #else /* FIO_HAVE_RDMA */
@@ -1231,13 +1231,13 @@ static int fio_rdmaio_init(struct thread_data fio_unused * td)
 }
 
 static struct ioengine_ops ioengine_rw = {
-       .name = "rdma",
-       .version = FIO_IOOPS_VERSION,
-       .init = fio_rdmaio_init,
-       .queue = fio_rdmaio_queue,
-       .open_file = fio_rdmaio_open_file,
-       .close_file = fio_rdmaio_close_file,
-       .flags = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR | FIO_PIPEIO,
+       .name           = "rdma",
+       .version        = FIO_IOOPS_VERSION,
+       .init           = fio_rdmaio_init,
+       .queue          = fio_rdmaio_queue,
+       .open_file      = fio_rdmaio_open_file,
+       .close_file     = fio_rdmaio_close_file,
+       .flags          = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR | FIO_PIPEIO,
 };
 
 #endif