!23 update to 3.8.5

From: @wangjie5911 
Reviewed-by: @wu-leilei 
Signed-off-by: @wu-leilei
This commit is contained in:
openeuler-ci-bot 2023-04-23 06:02:10 +00:00 committed by Gitee
commit 5c7645db4f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 6 additions and 34 deletions

View File

@ -1,30 +0,0 @@
From 1fa8d43007b31115342002ac675c905d9f18fbd9 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Thu, 3 Mar 2022 09:39:52 -0600
Subject: [PATCH] sanlock: fix memory leak of lockspace renewal_history
Leak was in original commit for "sanlock: renewal history"
6313c709722b3ba63234a75d1651a160bf1728ee.
With the default renewal history size, each lockspace that
was created would leak about 4kb of memory.
---
src/lockspace.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lockspace.c b/src/lockspace.c
index 2ebc247..d23dccd 100644
--- a/src/lockspace.c
+++ b/src/lockspace.c
@@ -939,6 +939,8 @@ static void free_sp(struct space *sp)
{
if (sp->lease_status.renewal_read_buf)
free(sp->lease_status.renewal_read_buf);
+ if (sp->renewal_history)
+ free(sp->renewal_history);
free(sp);
}
--
1.8.3.1

Binary file not shown.

BIN
sanlock-3.8.5.tar.gz Normal file

Binary file not shown.

View File

@ -1,13 +1,12 @@
Name: sanlock Name: sanlock
Version: 3.8.4 Version: 3.8.5
Release: 3 Release: 1
Summary: A shared storage lock manager Summary: A shared storage lock manager
License: GPLv2 and GPLv2+ and LGPLv2+ License: GPLv2 and GPLv2+ and LGPLv2+
URL: https://pagure.io/sanlock/ URL: https://pagure.io/sanlock/
Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz
Patch1: 0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch Patch1: Add-sanlk-reset-command-t-options.patch
Patch2: Add-sanlk-reset-command-t-options.patch
BuildRequires: libblkid-devel libaio-devel python3 python3-devel systemd-units gcc BuildRequires: libblkid-devel libaio-devel python3 python3-devel systemd-units gcc
Requires(pre): shadow Requires(pre): shadow
@ -153,6 +152,9 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
%changelog %changelog
* Wed Apr 12 2023 wangjie5911 <jiewangaw@isoftstone.com> - 3.8.5-1
- update to 3.8.5 and sync patch Add sanlk_reset command t options.
* Wed Mar 08 2023 xu_ping <xu_ping33@h-pattners.com> - 3.8.4-3 * Wed Mar 08 2023 xu_ping <xu_ping33@h-pattners.com> - 3.8.4-3
- fix sanlk-reset -t command error. - fix sanlk-reset -t command error.