X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Frdma.c;h=54fd19463462229c1a5bd99b433798ee925eda99;hb=93eee04aef9ed39070ce2e69bd1f661a95b1d50a;hp=61a90b8a6dd9a6d912f993cc47c42bcc2e5e0e39;hpb=76cc522425be0e13f06c49bfc3f5b7ac7032a777;p=fio.git

diff --git a/engines/rdma.c b/engines/rdma.c
index 61a90b8a..54fd1946 100644
--- a/engines/rdma.c
+++ b/engines/rdma.c
@@ -1,16 +1,17 @@
 /*
- * rdma engine
+ * RDMA I/O engine
  *
- * RDMA IO engine using OFED library.
- * Support both RDMA memory semantic and channel semantic
- *   in InfiniBand, RoCE and iWarp environment.
+ * RDMA I/O engine based on the IB verbs and RDMA/CM user space libraries.
+ * Supports both RDMA memory semantics and channel semantics
+ *   for the InfiniBand, RoCE and iWARP protocols.
  *
- * This is currently disabled. To enable it, execute:
+ * This I/O engine is disabled by default. To enable it, execute:
  *
  * $ export EXTFLAGS="-DFIO_HAVE_RDMA"
  * $ export EXTLIBS="-libverbs -lrdmacm"
  *
- * before running make. You'll need the OFED as well:
+ * before running make. You will need the Linux RDMA software as well, either
+ * from your Linux distributor or directly from openfabrics.org:
  *
  * http://www.openfabrics.org/downloads/OFED/
  *
@@ -204,7 +205,7 @@ static int cq_event_handler(struct thread_data *td, enum ibv_wc_opcode opcode)
 				}
 			}
 			if (i == rd->io_u_flight_nr)
-				log_err("fio: recv wr %ld not found\n",
+				log_err("fio: recv wr %" PRId64 " not found\n",
 					wc.wr_id);
 			else {
 				/* put the last one into middle of the list */
@@ -233,7 +234,7 @@ static int cq_event_handler(struct thread_data *td, enum ibv_wc_opcode opcode)
 				}
 			}
 			if (i == rd->io_u_flight_nr)
-				log_err("fio: send wr %ld not found\n",
+				log_err("fio: send wr %" PRId64 " not found\n",
 					wc.wr_id);
 			else {
 				/* put the last one into middle of the list */
@@ -586,8 +587,10 @@ static int fio_rdmaio_send(struct thread_data *td, struct io_u **io_us,
 {
 	struct rdmaio_data *rd = td->io_ops->data;
 	struct ibv_send_wr *bad_wr;
+#if 0
 	enum ibv_wc_opcode comp_opcode;
 	comp_opcode = IBV_WC_RDMA_WRITE;
+#endif
 	int i, index;
 	struct rdma_io_u_data *r_io_u_d;
 
@@ -1017,8 +1020,9 @@ static int fio_rdmaio_init(struct thread_data *td)
 	/* soft limit */
 	if ((rl.rlim_cur != RLIM_INFINITY)
 	    && (rl.rlim_cur < td->orig_buffer_size)) {
-		log_err("fio: soft RLIMIT_MEMLOCK is: %ld\n", rl.rlim_cur);
-		log_err("fio: total block size is:    %ld\n",
+		log_err("fio: soft RLIMIT_MEMLOCK is: %" PRId64 "\n",
+			rl.rlim_cur);
+		log_err("fio: total block size is:    %zd\n",
 			td->orig_buffer_size);
 		/* try to set larger RLIMIT_MEMLOCK */
 		rl.rlim_cur = rl.rlim_max;