Recent changes (master)

[Jens Axboe <axboe@xxxxxxxxx>]

The following changes since commit 4e472f8806571ea5799bc898e44609697ba0e140:

  Merge branch 'master' of https://github.com/preichl/fio (2023-12-14 14:15:34 -0700)

are available in the Git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to c77fe6859b6ef937a6ca900c1fab009175d721f8:

  engines/http: use proper error value (2023-12-15 13:17:13 -0700)

----------------------------------------------------------------
Jens Axboe (2):
      Merge branch 'master' of https://github.com/preichl/fio
      engines/http: use proper error value

Pavel Reichl (3):
      engines/rdma: remove dead code
      client/server: remove dead code
      engines/http: Drop unused varible

 engines/http.c | 3 +--
 engines/rdma.c | 1 -
 server.c       | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

---

Diff of recent changes:

diff --git a/engines/http.c b/engines/http.c
index 83cfe8bb..99f4e119 100644
--- a/engines/http.c
+++ b/engines/http.c
@@ -640,7 +640,6 @@ static enum fio_q_status fio_http_queue(struct thread_data *td,
 	char url[1024];
 	long status;
 	CURLcode res;
-	int r = -1;
 
 	fio_ro_check(td, io_u);
 	memset(&_curl_stream, 0, sizeof(_curl_stream));
@@ -712,7 +711,7 @@ static enum fio_q_status fio_http_queue(struct thread_data *td,
 	log_err("WARNING: Only DDIR_READ/DDIR_WRITE/DDIR_TRIM are supported!\n");
 
 err:
-	io_u->error = r;
+	io_u->error = EIO;
 	td_verror(td, io_u->error, "transfer");
 out:
 	curl_slist_free_all(slist);
diff --git a/engines/rdma.c b/engines/rdma.c
index ebdbcb1c..07336f3b 100644
--- a/engines/rdma.c
+++ b/engines/rdma.c
@@ -276,7 +276,6 @@ static int cq_event_handler(struct thread_data *td, enum ibv_wc_opcode opcode)
 	int i;
 
 	while ((ret = ibv_poll_cq(rd->cq, 1, &wc)) == 1) {
-		ret = 0;
 		compevnum++;
 
 		if (wc.status) {
diff --git a/server.c b/server.c
index 06eac584..b9f0e2ac 100644
--- a/server.c
+++ b/server.c
@@ -1883,7 +1883,6 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
 
 		offset = (char *)extended_buf_wp - (char *)extended_buf;
 		ptr->ts.ss_bw_data_offset = cpu_to_le64(offset);
-		extended_buf_wp = ss_bw + (int) ts->ss_dur;
 	}
 
 	fio_net_queue_cmd(FIO_NET_CMD_TS, extended_buf, extended_buf_size, NULL, SK_F_COPY);