1
0
forked from rpms/libblockdev

s390: Do not try to close an unopened stream

This commit is contained in:
Vojtech Trefny 2023-06-19 11:15:26 +02:00
parent 093cfeed36
commit 750062c251
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From ea1c7363b88d804e41a7ba0844a0e558f521eb03 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Mon, 19 Jun 2023 11:09:10 +0200
Subject: [PATCH] s390: Do not try to close an unopened stream
Our Fedora builds are failing on this on s390x.
---
src/plugins/s390.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/plugins/s390.c b/src/plugins/s390.c
index fb0dc982..705a9ae7 100644
--- a/src/plugins/s390.c
+++ b/src/plugins/s390.c
@@ -601,7 +601,6 @@ gboolean bd_s390_zfcp_online (const gchar *devno, const gchar *wwpn, const gchar
boolrc = bd_utils_exec_and_report_error_no_progress (zfcp_cio_free, NULL, error);
if (!boolrc) {
- fclose (fd);
g_free (online);
g_set_error (error, BD_S390_ERROR, BD_S390_ERROR_DEVICE,
"Could not remove device %s from device ignore list.", devno);
--
2.40.1

View File

@ -125,12 +125,13 @@
Name: libblockdev
Version: 2.28
Release: 7%{?dist}
Release: 8%{?dist}
Summary: A library for low-level manipulation with block devices
License: LGPL-2.1-or-later
URL: https://github.com/storaged-project/libblockdev
Source0: https://github.com/storaged-project/libblockdev/releases/download/%{version}-%{release}/%{name}-%{version}.tar.gz
Patch0: 0001-Allow-resizing-of-inactive-LVs-with-latest-LVM.patch
Patch1: 0002-s390-Do-not-try-to-close-an-unopened-stream.patch
BuildRequires: make
BuildRequires: glib2-devel
@ -978,6 +979,9 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
%files plugins-all
%changelog
* Mon Jun 19 2023 Vojtech Trefny <vtrefny@redhat.com> - 2.28-8
- s390: Do not try to close an unopened stream
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 2.28-7
- Rebuilt for Python 3.12