Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Sep 9, 2021 Library code

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit f7942acdc23a4ee837ef30834e1d2cb1fc6d0afe:

options: Add thinktime_iotime option (2021-09-05 21:11:25 -0600)

are available in the Git repository at:

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

for you to fetch changes up to 25425cb4a5531b1b3f26eba4e49866d944e0f1fb:

Merge branch 'ft' of https://github.com/ErwanAliasr1/fio (2021-09-08 15:40:47 -0600)

----------------------------------------------------------------
Andrzej Jakowski (2):
t/io_uring: fixes in output
t/io_uring: allow flexible IO threads assignment

Erwan Velu (7):
engines/sg: Return error if generic_close_file fails
filesetup: Removing unused variable usage
stat: Avoid freeing null pointer engines/sg: Removing useless variable assignment lib/fls.h: Remove unused variable assignment
zbd: Removing useless variable assignment
log: Removing useless assignment

Jens Axboe (5):
t/io_uring: don't make setrlimit() failing fatal Fio 3.28
t/io_uring: ensure that nthreads is > 0
README: add link to new lore archive
Merge branch 'ft' of https://github.com/ErwanAliasr1/fio

 FIO-VERSION-GEN |  2 +-
 README          |  4 +++
 engines/sg.c    |  7 ++---
 filesetup.c     |  1 -
 lib/fls.h       |  1 -
 log.c           |  2 +-
 stat.c          |  3 +-
 t/io_uring.c    | 96 +++++++++++++++++++++++++++++++++++----------------------
 zbd.c           |  2 +-
 9 files changed, 71 insertions(+), 47 deletions(-)

---

Diff of recent changes:

FIO-VERSION-GEN +1 -1
index 47af94e9..e9d563c1 100755
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=FIO-VERSION-FILE
-DEF_VER=fio-3.27
+DEF_VER=fio-3.28
 
 LF='
 '
README +4 -0
index 2fecf0e0..52eca5c3 100644
@@ -72,6 +72,10 @@ in the body of the email. Archives can be found here:
 
 	http://www.spinics.net/lists/fio/
 
+or here:
+
+	https://lore.kernel.org/fio/
+
 and archives for the old list can be found here:
 
 	http://maillist.kernel.dk/fio-devel/
engines/sg.c +3 -4
index 0c2d2c8b..1c019384 100644
@@ -471,10 +471,9 @@ static enum fio_q_status fio_sgio_rw_doio(struct thread_data *td,
 			if (__io_u == io_u)
 				break;
 
-			if (io_u_sync_complete(td, __io_u)) {
-				ret = -1;
+			if (io_u_sync_complete(td, __io_u))
 				break;
-			}
+
 		} while (1);
 
 		return FIO_Q_COMPLETED;
@@ -982,7 +981,7 @@ static int fio_sgio_open(struct thread_data *td, struct fio_file *f)
 
 	if (sd && !sd->type_checked && fio_sgio_type_check(td, f)) {
 		ret = generic_close_file(td, f);
-		return 1;
+		return ret;
 	}
 
 	return 0;
filesetup.c +0 -1
index 296de5a1..228e4fff 100644
@@ -1024,7 +1024,6 @@ int longest_existing_path(char *path) {
 	while (!done) {
 		buf_pos = strrchr(buf, FIO_OS_PATH_SEPARATOR);
 		if (!buf_pos) {
-			done = true;
 			offset = 0;
 			break;
 		}
lib/fls.h +0 -1
index dc7ecd0d..99e1862a 100644
@@ -32,7 +32,6 @@ static inline int __fls(int x)
 		r -= 2;
 	}
 	if (!(x & 0x80000000u)) {
-		x <<= 1;
 		r -= 1;
 	}
 	return r;
log.c +1 -1
index 562a29aa..237bac28 100644
@@ -62,7 +62,7 @@ void log_prevalist(int type, const char *fmt, va_list args)
 	free(buf1);
 	if (len < 0)
 		return;
-	len = log_info_buf(buf2, len);
+	log_info_buf(buf2, len);
 	free(buf2);
 }
 #endif
stat.c +1 -2
index 99275620..ac53463d 100644
@@ -211,7 +211,7 @@ static void show_clat_percentiles(uint64_t *io_u_plat, unsigned long long nr,
 
 	len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
 	if (!len || !ovals)
-		goto out;
+		return;
 
 	/*
 	 * We default to nsecs, but if the value range is such that we
@@ -258,7 +258,6 @@ static void show_clat_percentiles(uint64_t *io_u_plat, unsigned long long nr,
 			log_buf(out, "\n");
 	}
 
-out:
 	free(ovals);
 }
 
t/io_uring.c +60 -36

149 lines not on this page · raw message

zbd.c +1 -1
index 1b933ce4..dd1abc58 100644
@@ -1857,7 +1857,7 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
 				       f->file_name);
 				goto eof;
 			}
-			zone_idx_b = zbd_zone_nr(f, zb);
+			zbd_zone_nr(f, zb);
 		}
 		/* Check whether the zone reset threshold has been exceeded */
 		if (td->o.zrf.u.f) {