[PATCH 1/3] RDMA engine spelling fix: change FIO_RDMA_MAX_IO_DPETH into FIO_RDMA_MAX_IO_DEPTH

[PATCH 1/3] RDMA engine spelling fix: change FIO_RDMA_MAX_IO_DPETH into FIO_RDMA_MAX_IO_DEPTH

[Bart Van Assche]

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Ren Yufei <renyufei83@yahoo.com.cn>
Cc: Jens Axboe <jaxboe@fusionio.com>

---
 engines/rdma.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engines/rdma.c b/engines/rdma.c
index 060927a..61a90b8 100644
--- 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 {
@@ -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;
 }
@@ -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;
 	}
 
-- 
1.7.3.4

Re: [PATCH 1/3] RDMA engine spelling fix: change FIO_RDMA_MAX_IO_DPETH into FIO_RDMA_MAX_IO_DEPTH

[Jens Axboe]

On 2011-08-06 20:17, Bart Van Assche wrote:
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> Cc: Ren Yufei <renyufei83@yahoo.com.cn>
> Cc: Jens Axboe <jaxboe@fusionio.com>

Thanks Bart! Applied 1-3.

-- 
Jens Axboe

Re: [PATCH 1/3] RDMA engine spelling fix: change FIO_RDMA_MAX_IO_DPETH into FIO_RDMA_MAX_IO_DEPTH

[Bart Van Assche]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

On Sun, Aug 7, 2011 at 9:51 PM, Jens Axboe <jaxboe@fusionio.com<mailto:jaxboe@fusionio.com>> wrote:
On 2011-08-06 20:17, Bart Van Assche wrote:
> Signed-off-by: Bart Van Assche <bvanassche@acm.org<mailto:bvanassche@acm.org>>
> Cc: Ren Yufei <renyufei83@yahoo.com.cn<mailto:renyufei83@yahoo.com.cn>>
> Cc: Jens Axboe <jaxboe@fusionio.com<mailto:jaxboe@fusionio.com>>

Thanks Bart! Applied 1-3.

Thanks for applying these patches. Sorry, but I just noticed I forgot to update one documentation section - I will send an additional patch as a separate e-mail.

Bart.

[-- Attachment #2: Type: text/html, Size: 871 bytes --]