mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-cluster/glusterfs: remove unused patches
Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16533 Signed-off-by: Aaron Bauman <bman@gentoo.org>
This commit is contained in:
committed by
Aaron Bauman
parent
6ef254e13d
commit
8b0c537b6d
@@ -1,11 +0,0 @@
|
||||
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
|
||||
index 1d0ac27e8..b1a7c0a93 100644
|
||||
--- a/libglusterfs/src/compat.h
|
||||
+++ b/libglusterfs/src/compat.h
|
||||
@@ -510,6 +510,7 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
|
||||
/* Use run API, see run.h */
|
||||
#include <stdlib.h> /* system(), mkostemp() */
|
||||
#include <stdio.h> /* popen() */
|
||||
+#include <sys/sysmacros.h>
|
||||
#pragma GCC poison system mkostemp popen
|
||||
#endif
|
||||
@@ -1,15 +0,0 @@
|
||||
diff -Naur a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2018-03-08 22:50:23.221758897 +0000
|
||||
+++ b/configure.ac 2018-03-08 22:53:12.776129757 +0000
|
||||
@@ -19,11 +19,6 @@
|
||||
#but libglusterfs fails to build with contrib (Then are not set up that way?)
|
||||
#AM_INIT_AUTOMAKE([subdir-objects])
|
||||
|
||||
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
|
||||
-
|
||||
-if make --help 2>&1 | grep -q no-print-directory; then
|
||||
- AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
|
||||
-fi
|
||||
|
||||
AC_CONFIG_HEADERS([config.h site.h])
|
||||
|
||||
@@ -1,185 +0,0 @@
|
||||
From ff1eae7f882b8f12380e0c35a9a73b672583cd4c Mon Sep 17 00:00:00 2001
|
||||
From: N Balachandran <nbalacha@redhat.com>
|
||||
Date: Tue, 01 Oct 2019 17:37:15 +0530
|
||||
Subject: [PATCH] cluster/dht: Correct fd processing loop
|
||||
|
||||
The fd processing loops in the
|
||||
dht_migration_complete_check_task and the
|
||||
dht_rebalance_inprogress_task functions were unsafe
|
||||
and could cause an open to be sent on an already freed
|
||||
fd. This has been fixed.
|
||||
|
||||
> Change-Id: I0a3c7d2fba314089e03dfd704f9dceb134749540
|
||||
> Fixes: bz#1757399
|
||||
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
|
||||
> (cherry picked from commit 9b15867070b0cc241ab165886292ecffc3bc0aed)
|
||||
|
||||
Change-Id: I0a3c7d2fba314089e03dfd704f9dceb134749540
|
||||
Fixes: bz#1786983
|
||||
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
||||
---
|
||||
|
||||
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
|
||||
index acad493..4f7370d 100644
|
||||
--- a/xlators/cluster/dht/src/dht-helper.c
|
||||
+++ b/xlators/cluster/dht/src/dht-helper.c
|
||||
@@ -1290,6 +1290,7 @@
|
||||
fd_t *tmp = NULL;
|
||||
uint64_t tmp_miginfo = 0;
|
||||
dht_migrate_info_t *miginfo = NULL;
|
||||
+ gf_boolean_t skip_open = _gf_false;
|
||||
int open_failed = 0;
|
||||
|
||||
this = THIS;
|
||||
@@ -1428,24 +1429,34 @@
|
||||
* the loop will cause the destruction of the fd. So we need to
|
||||
* iterate the list safely because iter_fd cannot be trusted.
|
||||
*/
|
||||
- list_for_each_entry_safe(iter_fd, tmp, &inode->fd_list, inode_list)
|
||||
- {
|
||||
- if (fd_is_anonymous(iter_fd))
|
||||
- continue;
|
||||
-
|
||||
- if (dht_fd_open_on_dst(this, iter_fd, dst_node))
|
||||
- continue;
|
||||
-
|
||||
+ iter_fd = list_entry((&inode->fd_list)->next, typeof(*iter_fd), inode_list);
|
||||
+ while (&iter_fd->inode_list != (&inode->fd_list)) {
|
||||
+ if (fd_is_anonymous(iter_fd) ||
|
||||
+ (dht_fd_open_on_dst(this, iter_fd, dst_node))) {
|
||||
+ if (!tmp) {
|
||||
+ iter_fd = list_entry(iter_fd->inode_list.next, typeof(*iter_fd),
|
||||
+ inode_list);
|
||||
+ continue;
|
||||
+ }
|
||||
+ skip_open = _gf_true;
|
||||
+ }
|
||||
/* We need to release the inode->lock before calling
|
||||
* syncop_open() to avoid possible deadlocks. However this
|
||||
* can cause the iter_fd to be released by other threads.
|
||||
* To avoid this, we take a reference before releasing the
|
||||
* lock.
|
||||
*/
|
||||
- __fd_ref(iter_fd);
|
||||
+ fd_ref(iter_fd);
|
||||
|
||||
UNLOCK(&inode->lock);
|
||||
|
||||
+ if (tmp) {
|
||||
+ fd_unref(tmp);
|
||||
+ tmp = NULL;
|
||||
+ }
|
||||
+ if (skip_open)
|
||||
+ goto next;
|
||||
+
|
||||
/* flags for open are stripped down to allow following the
|
||||
* new location of the file, otherwise we can get EEXIST or
|
||||
* truncate the file again as rebalance is moving the data */
|
||||
@@ -1467,9 +1478,11 @@
|
||||
dht_fd_ctx_set(this, iter_fd, dst_node);
|
||||
}
|
||||
|
||||
- fd_unref(iter_fd);
|
||||
-
|
||||
+ next:
|
||||
LOCK(&inode->lock);
|
||||
+ skip_open = _gf_false;
|
||||
+ tmp = iter_fd;
|
||||
+ iter_fd = list_entry(tmp->inode_list.next, typeof(*tmp), inode_list);
|
||||
}
|
||||
|
||||
SYNCTASK_SETID(frame->root->uid, frame->root->gid);
|
||||
@@ -1482,6 +1495,10 @@
|
||||
|
||||
unlock:
|
||||
UNLOCK(&inode->lock);
|
||||
+ if (tmp) {
|
||||
+ fd_unref(tmp);
|
||||
+ tmp = NULL;
|
||||
+ }
|
||||
|
||||
out:
|
||||
if (dict) {
|
||||
@@ -1563,6 +1580,7 @@
|
||||
int open_failed = 0;
|
||||
uint64_t tmp_miginfo = 0;
|
||||
dht_migrate_info_t *miginfo = NULL;
|
||||
+ gf_boolean_t skip_open = _gf_false;
|
||||
|
||||
this = THIS;
|
||||
frame = data;
|
||||
@@ -1683,24 +1701,40 @@
|
||||
* the loop will cause the destruction of the fd. So we need to
|
||||
* iterate the list safely because iter_fd cannot be trusted.
|
||||
*/
|
||||
- list_for_each_entry_safe(iter_fd, tmp, &inode->fd_list, inode_list)
|
||||
- {
|
||||
- if (fd_is_anonymous(iter_fd))
|
||||
- continue;
|
||||
-
|
||||
- if (dht_fd_open_on_dst(this, iter_fd, dst_node))
|
||||
- continue;
|
||||
-
|
||||
+ iter_fd = list_entry((&inode->fd_list)->next, typeof(*iter_fd), inode_list);
|
||||
+ while (&iter_fd->inode_list != (&inode->fd_list)) {
|
||||
/* We need to release the inode->lock before calling
|
||||
* syncop_open() to avoid possible deadlocks. However this
|
||||
* can cause the iter_fd to be released by other threads.
|
||||
* To avoid this, we take a reference before releasing the
|
||||
* lock.
|
||||
*/
|
||||
- __fd_ref(iter_fd);
|
||||
|
||||
+ if (fd_is_anonymous(iter_fd) ||
|
||||
+ (dht_fd_open_on_dst(this, iter_fd, dst_node))) {
|
||||
+ if (!tmp) {
|
||||
+ iter_fd = list_entry(iter_fd->inode_list.next, typeof(*iter_fd),
|
||||
+ inode_list);
|
||||
+ continue;
|
||||
+ }
|
||||
+ skip_open = _gf_true;
|
||||
+ }
|
||||
+
|
||||
+ /* Yes, this is ugly but there isn't a cleaner way to do this
|
||||
+ * the fd_ref is an atomic increment so not too bad. We want to
|
||||
+ * reduce the number of inode locks and unlocks.
|
||||
+ */
|
||||
+
|
||||
+ fd_ref(iter_fd);
|
||||
UNLOCK(&inode->lock);
|
||||
|
||||
+ if (tmp) {
|
||||
+ fd_unref(tmp);
|
||||
+ tmp = NULL;
|
||||
+ }
|
||||
+ if (skip_open)
|
||||
+ goto next;
|
||||
+
|
||||
/* flags for open are stripped down to allow following the
|
||||
* new location of the file, otherwise we can get EEXIST or
|
||||
* truncate the file again as rebalance is moving the data */
|
||||
@@ -1721,9 +1755,11 @@
|
||||
dht_fd_ctx_set(this, iter_fd, dst_node);
|
||||
}
|
||||
|
||||
- fd_unref(iter_fd);
|
||||
-
|
||||
+ next:
|
||||
LOCK(&inode->lock);
|
||||
+ skip_open = _gf_false;
|
||||
+ tmp = iter_fd;
|
||||
+ iter_fd = list_entry(tmp->inode_list.next, typeof(*tmp), inode_list);
|
||||
}
|
||||
|
||||
SYNCTASK_SETID(frame->root->uid, frame->root->gid);
|
||||
@@ -1731,6 +1767,10 @@
|
||||
unlock:
|
||||
UNLOCK(&inode->lock);
|
||||
|
||||
+ if (tmp) {
|
||||
+ fd_unref(tmp);
|
||||
+ tmp = NULL;
|
||||
+ }
|
||||
if (open_failed) {
|
||||
ret = -1;
|
||||
goto out;
|
||||
Reference in New Issue
Block a user