From d558bbe58581e73a1ba34956925a53c222d6c8b0 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Wed, 26 Jan 2022 08:46:11 +0100
Subject: [PATCH] Remove double fclose in bd_s390_dasd_online (#2045784)

---
 ...le-fclose-in-bd_s390_dasd_online-204.patch | 24 +++++++++++++++++++
 libblockdev.spec                              |  7 +++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 0001-s390-Remove-double-fclose-in-bd_s390_dasd_online-204.patch

diff --git a/0001-s390-Remove-double-fclose-in-bd_s390_dasd_online-204.patch b/0001-s390-Remove-double-fclose-in-bd_s390_dasd_online-204.patch
new file mode 100644
index 0000000..82c02ec
--- /dev/null
+++ b/0001-s390-Remove-double-fclose-in-bd_s390_dasd_online-204.patch
@@ -0,0 +1,24 @@
+From c06dd957335053595e50f705c6a4d4e1caf15a9c Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Wed, 26 Jan 2022 08:33:19 +0100
+Subject: [PATCH] s390: Remove double fclose in bd_s390_dasd_online (#2045784)
+
+---
+ src/plugins/s390.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/plugins/s390.c b/src/plugins/s390.c
+index ac12b049..fb0dc982 100644
+--- a/src/plugins/s390.c
++++ b/src/plugins/s390.c
+@@ -290,7 +290,6 @@ gboolean bd_s390_dasd_online (const gchar *dasd, GError **error) {
+     if (wrc == EOF) {
+         g_set_error (error, BD_S390_ERROR, BD_S390_ERROR_DEVICE,
+                      "Could not set DASD device %s online", dasd);
+-        fclose(fd);
+         bd_utils_report_finished (progress_id, (*error)->message);
+         return FALSE;
+     }
+-- 
+2.33.1
+
diff --git a/libblockdev.spec b/libblockdev.spec
index 30cb944..f3d67b2 100644
--- a/libblockdev.spec
+++ b/libblockdev.spec
@@ -125,11 +125,12 @@
 
 Name:        libblockdev
 Version:     2.26
-Release:     2%{?dist}
+Release:     3%{?dist}
 Summary:     A library for low-level manipulation with block devices
 License:     LGPLv2+
 URL:         https://github.com/storaged-project/libblockdev
 Source0:     https://github.com/storaged-project/libblockdev/releases/download/%{version}-%{release}/%{name}-%{version}.tar.gz
+Patch0:      0001-s390-Remove-double-fclose-in-bd_s390_dasd_online-204.patch
 
 BuildRequires: make
 BuildRequires: glib2-devel
@@ -677,6 +678,7 @@ A meta-package that pulls all the libblockdev plugins as dependencies.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 autoreconf -ivf
@@ -980,6 +982,9 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %files plugins-all
 
 %changelog
+* Wed Jan 26 2022 Vojtech Trefny <vtrefny@redhat.com> - 2.26-3
+- Remove double fclose in bd_s390_dasd_online (#2045784)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.26-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild