diff --git a/0001-fix-disk-stats-issue.patch b/0001-fix-disk-stats-issue.patch deleted file mode 100644 index e2301825315a8b252ccaf34efefacc45ecc3d897..0000000000000000000000000000000000000000 --- a/0001-fix-disk-stats-issue.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c492cb1a9b1c327e985c89eb517d58bd5323880c Mon Sep 17 00:00:00 2001 -From: Yong Gang -Date: Mon, 15 Apr 2024 15:06:11 +0800 -Subject: [PATCH] iolog: fix disk stats issue -In the iolog replay scenario, the disk util in the td structure is -not initialized, resulting in the disk stats not being correctly -updated. - -Fixes: #1735 - -Signed-off-by: Yong Gang ---- - iolog.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/iolog.c b/iolog.c -index 5213c60..d447e4d 100644 ---- a/iolog.c -+++ b/iolog.c -@@ -812,6 +812,8 @@ bool init_iolog(struct thread_data *td) - if (!ret) - td_verror(td, EINVAL, "failed initializing iolog"); - -+ init_disk_util(td); -+ - return ret; - } - --- -2.27.0 - diff --git a/0002-engines-http-Fix-memory-leak.patch b/0002-engines-http-Fix-memory-leak.patch deleted file mode 100644 index bdb6c516a3cdb759aa4c1457cb7302ecb79768c2..0000000000000000000000000000000000000000 --- a/0002-engines-http-Fix-memory-leak.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9e66b0606cad74cb98dc44cb91903432171585a9 Mon Sep 17 00:00:00 2001 -From: Pavel Reichl -Date: Thu, 14 Dec 2023 22:10:25 +0100 -Subject: engines/http: Fix memory leak - -Reference:https://git.kernel.org/pub/scm/linux/kernel/git/axboe/fio.git/patch/?id=9e66b0606cad74cb98dc44cb91903432171585a9 - -Found by Red Hat's OpenScanHub: - -fio-3.35/engines/http.c:253: leaked_storage: Variable r going out of scope leaks the storage it points to. - -Signed-off-by: Pavel Reichl ---- - engines/http.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/engines/http.c b/engines/http.c -index 56dc7d1..83cfe8b 100644 ---- a/engines/http.c -+++ b/engines/http.c -@@ -250,6 +250,7 @@ static char *_aws_uriencode(const char *uri) - for (i = 0; (c = uri[i]); i++) { - if (n > bufsize-5) { - log_err("encoding the URL failed\n"); -+ free(r); - return NULL; - } - --- -2.27.0 - diff --git a/fio-3.36.tar.bz2 b/fio-3.37.tar.bz2 similarity index 47% rename from fio-3.36.tar.bz2 rename to fio-3.37.tar.bz2 index 038eefc9c6c4ab9ad482f46c9aececabbfb94e12..e52650d6158ced6f8f61f4c4a952db81faf761aa 100644 Binary files a/fio-3.36.tar.bz2 and b/fio-3.37.tar.bz2 differ diff --git a/fio.spec b/fio.spec index 3714c6237d2260e607da29f47156cb2231472035..98250e0b6c6215807bd7b07314b1efb97656d138 100644 --- a/fio.spec +++ b/fio.spec @@ -1,16 +1,12 @@ Name: fio -Version: 3.36 -Release: 3 +Version: 3.37 +Release: 1 Summary: Multithreaded IO generation tool -License: GPLv2 +License: GPL-2.0-only URL: http://git.kernel.dk/?p=fio.git;a=summary Source0: http://brick.kernel.dk/snaps/%{name}-%{version}.tar.bz2 -#https://github.com/axboe/fio/pull/1736 -Patch0001: 0001-fix-disk-stats-issue.patch -Patch0002: 0002-engines-http-Fix-memory-leak.patch - BuildRequires: gcc BuildRequires: libaio-devel BuildRequires: zlib-devel @@ -83,6 +79,10 @@ make test %changelog +* Fri Jul 05 2024 wangkai <13474090681@163.com> - 3.37-1 +- Update to 3.37 +- Change: https://git.kernel.dk/?p=fio.git;a=shortlog;h=refs/tags/fio-3.37 + * Tue Jun 4 2024 zhangyaqi - 3.36-3 - engines/http: Fix memory leak