From 1474071de0f49f3b0b098673ee04993bd45736a9 Mon Sep 17 00:00:00 2001 From: liuh Date: Thu, 18 Apr 2024 15:30:03 +0800 Subject: [PATCH] Fix a missing-unlocking bug --- 0029-Fix-a-missing-unlocking-bug.patch | 27 ++++++++++++++++++++++++++ open-iscsi.spec | 6 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0029-Fix-a-missing-unlocking-bug.patch diff --git a/0029-Fix-a-missing-unlocking-bug.patch b/0029-Fix-a-missing-unlocking-bug.patch new file mode 100644 index 0000000..3f8ae64 --- /dev/null +++ b/0029-Fix-a-missing-unlocking-bug.patch @@ -0,0 +1,27 @@ +From b9778e59b07227ab9dd627de6565df90de464fd2 Mon Sep 17 00:00:00 2001 +From: ryancaicse +Date: Thu, 18 Apr 2024 15:16:54 +0800 +Subject: [PATCH] Fix a missing-unlocking bug + +--- + iscsiuio/src/unix/nic_utils.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/iscsiuio/src/unix/nic_utils.c b/iscsiuio/src/unix/nic_utils.c +index ec4535d..2f4eb21 100644 +--- a/iscsiuio/src/unix/nic_utils.c ++++ b/iscsiuio/src/unix/nic_utils.c +@@ -1042,9 +1042,8 @@ void prepare_nic_thread(nic_t *nic) + LOG_INFO("Created nic thread: %s", nic->log_name); + } + +- pthread_mutex_unlock(&nic->nic_mutex); +- + error: ++ pthread_mutex_unlock(&nic->nic_mutex); + return; + } + +-- +2.27.0 + diff --git a/open-iscsi.spec b/open-iscsi.spec index 7479529..d9f2f61 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.1.5 -Release: 14 +Release: 15 Summary: ISCSI software initiator daemon and utility programs License: GPLv2+ and BSD URL: http://www.open-iscsi.com @@ -37,6 +37,7 @@ patch25: 0025-iscsid-iscsiuio-fix-OOM-adjustment-377.patch patch26: 0026-iscsid-clear-scanning-thread-s-PR_SET_IO_FLUSHER-fla.patch patch27: 0027-iscsid-stop-connection-for-recovery-if-error-is-not-.patch patch28: 0028-discoveryd-fix-format-overflow-warning-413.patch +patch29: 0029-Fix-a-missing-unlocking-bug.patch BuildRequires: flex bison doxygen kmod-devel systemd-units gcc git isns-utils-devel systemd-devel BuildRequires: autoconf automake libtool libmount-devel openssl-devel pkg-config @@ -163,6 +164,9 @@ fi %{_mandir}/man8/* %changelog +* Thu Apr 18 2024 liuh - 2.1.5-15 +- sync patch from community + * Tue Feb 20 2024 jiangjianjun - 2.1.5-14 - update open-iscsi.spec -- Gitee