[gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/files/

[Conrad Kostecki]

commit:     9f673c23495eb421b5fe80fdc636d30ed5a90e78
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov 23 19:59:15 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 20:36:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f673c23

sys-cluster/glusterfs: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/23058
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-cluster/glusterfs/files/glusterd-r3.initd      | 32 -----------
 .../glusterfs/files/glusterfs-7.7-flock.patch      | 65 ----------------------
 2 files changed, 97 deletions(-)

diff --git a/sys-cluster/glusterfs/files/glusterd-r3.initd b/sys-cluster/glusterfs/files/glusterd-r3.initd
deleted file mode 100644
index 27682d06216d..000000000000
--- a/sys-cluster/glusterfs/files/glusterd-r3.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gluster elastic volume management daemon"
-command="/usr/sbin/glusterd"
-pidfile="/var/run/${SVCNAME}.pid"
-command_args="-N"
-
-command_background="yes"
-
-depend() {
-	need net
-	before netmount
-}
-
-start_pre() {
-	# Ensure that the GlusterFS auxiliary mount parent directory exists
-	checkpath --directory --owner gluster:gluster --mode 0775 /var/run/gluster
-}
-
-start_post() {
-	local c=0
-	ebegin "Waiting for glusterd to start up"
-	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
-		(( ++c ))
-	done
-	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
-	eend $?
-
-	return 0
-}

diff --git a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch
deleted file mode 100644
index f7930406cd18..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# https://bugs.gentoo.org/733228
-# https://bugzilla.redhat.com/show_bug.cgi?id=1718562
-# https://bugzilla.redhat.com/show_bug.cgi?id=1776152
-# https://review.gluster.org/#/c/glusterfs/+/23794/8/xlators/features/locks/src/common.c
-
-From 6ef82683064a87c434bd67e2004935281e4c04cc Mon Sep 17 00:00:00 2001
-From: l17zhou <cynthia.zhou@×××××××××××.com>
-Date: Tue, 03 Dec 2019 07:43:35 +0200
-Subject: [PATCH] add clean local after grant lock
-
-found by flock test, without correct ref number of fd,
-lock will not be correctly released.
-
-Fixes: bz#1779089
-Change-Id: I3e466b17c852eb219c8778e43af8ad670a8449cc
-Signed-off-by: l17zhou <cynthia.zhou@×××××××××××.com>
----
-
-diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
-index c78d537..4c6b78c 100644
---- a/xlators/features/locks/src/common.c
-+++ b/xlators/features/locks/src/common.c
-@@ -962,7 +962,7 @@
-     struct list_head granted_list;
-     posix_lock_t *tmp = NULL;
-     posix_lock_t *lock = NULL;
--
-+    pl_local_t *local = NULL;
-     INIT_LIST_HEAD(&granted_list);
- 
-     pthread_mutex_lock(&pl_inode->mutex);
-@@ -977,9 +977,9 @@
- 
-         pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock,
-                      0, 0, NULL);
--
--        STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL);
--
-+        local = lock->frame->local;
-+        PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0,
-+                                 &lock->user_flock, NULL);
-         __destroy_lock(lock);
-     }
- 
-@@ -999,6 +999,7 @@
-     struct list_head granted_list;
-     posix_lock_t *tmp = NULL;
-     posix_lock_t *lock = NULL;
-+    pl_local_t *local = NULL;
- 
-     int ret = -1;
- 
-@@ -1026,9 +1027,9 @@
- 
-         pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock,
-                      0, 0, NULL);
--
--        STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL);
--
-+        local = lock->frame->local;
-+        PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0,
-+                                 &lock->user_flock, NULL);
-         __destroy_lock(lock);
-     }
-