Recent changes (master)
The following changes since commit e682f9b3406e35a28a87f39789e3a0c6138b30b4:
ci: add nvmept_write_mode.py to test harness (2026-06-01 14:38:22 -0400)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 5b476c918091ff15705f3cd26a6a30a2084cd880:
Merge branch 'master' of https://github.com/wangxp006/fio (2026-06-02 12:27:16 -0400)
----------------------------------------------------------------
Vincent Fu (1):
Merge branch 'master' of https://github.com/wangxp006/fio
xiaopeng.wang (1):
blktrace: fix three bugs in merge_blktrace_iologs path
blktrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
---
Diff of recent changes:
blktrace.c +5 -3
@@ -664,7 +664,7 @@ static int read_trace(struct thread_data *td, struct blktrace_cursor *bc) read_skip:/* read an io trace */ - ret =fread (&t,1 ,sizeof (t), bc->f); + ret =fread (t,1 ,sizeof (*t), bc->f);if (ferror (bc->f)) {td_verror (td, errno,"read blktrace file" );return ret;
@@ -790,7 +790,9 @@ int merge_blktrace_iologs(struct thread_data *td) }/* set iolog file to read from the newly merged file */ +free (td->o.read_iolog_file); td->o.read_iolog_file = td->o.merge_blktrace_file; + td->o.merge_blktrace_file =NULL ; ret =0 ; err_file:
@@ -799,10 +801,10 @@ err_file:fclose (bcs[i].f); } err_merge_buf: -free (merge_buf); -err_out_file:fflush (merge_fp);fclose (merge_fp); +err_out_file: +free (merge_buf); err_param:free (bcs);