From d2d37a01bf84480e1ec6af6854485fd0b61f5a35 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 28 2020 19:08:29 +0000
Subject: import fio-3.19-2.el8


---

diff --git a/SOURCES/0001-Unbreak-the-pmemblk-engine.patch b/SOURCES/0001-Unbreak-the-pmemblk-engine.patch
new file mode 100644
index 0000000..832d2b1
--- /dev/null
+++ b/SOURCES/0001-Unbreak-the-pmemblk-engine.patch
@@ -0,0 +1,37 @@
+From 8644ef7c4c49aa6d6492b3b250a06b841496d7fd Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <bvanassche@acm.org>
+Date: Sat, 27 Jun 2020 07:26:24 -0700
+Subject: [PATCH] Unbreak the pmemblk engine
+
+Reported-by: Yi Zhang <yi.zhang@redhat.com>
+Tested-by: Yi Zhang <yi.zhang@redhat.com>
+Fixes: e9c7be0e32e6 ("pmemblk: Fix a memory leak")
+Signed-off-by: Bart Van Assche <bvanassche@acm.org>
+---
+ engines/pmemblk.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/engines/pmemblk.c b/engines/pmemblk.c
+index 730f4d7..e2eaa15 100644
+--- a/engines/pmemblk.c
++++ b/engines/pmemblk.c
+@@ -220,14 +220,14 @@ static fio_pmemblk_file_t pmb_open(const char *pathspec, int flags)
+ 		pmb->pmb_nblocks = pmemblk_nblock(pmb->pmb_pool);
+ 
+ 		fio_pmemblk_cache_insert(pmb);
++	} else {
++		free(path);
+ 	}
+ 
+ 	pmb->pmb_refcnt += 1;
+ 
+ 	pthread_mutex_unlock(&CacheLock);
+ 
+-	free(path);
+-
+ 	return pmb;
+ 
+ error:
+-- 
+2.9.5
+
diff --git a/SPECS/fio.spec b/SPECS/fio.spec
index 9d42235..98b0def 100644
--- a/SPECS/fio.spec
+++ b/SPECS/fio.spec
@@ -1,6 +1,6 @@
 Name:		fio
 Version:	3.19
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Multithreaded IO generation tool
 
 Group:		Applications/System
@@ -9,6 +9,7 @@ URL:		http://git.kernel.dk/?p=fio.git;a=summary
 Source:		http://brick.kernel.dk/snaps/%{name}-%{version}.tar.bz2
 
 Patch0:		fio-eliminate-extra-log-samples.patch
+Patch1:		0001-Unbreak-the-pmemblk-engine.patch
 
 BuildRequires:	gcc
 BuildRequires:	libaio-devel
@@ -35,6 +36,7 @@ one wants to simulate.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 pathfix.py -i %{__python3} -pn \
  doc/conf.py \
@@ -60,6 +62,9 @@ make install prefix=%{_prefix} mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT INSTALL
 %{_datadir}/%{name}/*
 
 %changelog
+* Tue Jul 14 2020 Eric Sandeen <sandeen@redhat.com> 3.19-2
+- Fix regression in pmemblk engine (#1846843)
+
 * Mon Apr 20 2020 Eric Sandeen <sandeen@redhat.com> 3.19-1
 - Rebase to new upstream + bugfix