[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/

[Jonathan Vasquez]

commit:     b04e5ed88450f6754b6e63fc87af6e0daac5fe29
Author:     Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 16:31:26 2017 +0000
Commit:     Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 16:32:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04e5ed8

sys-fs/zfs-kmod: removing unused patches

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch | 44 --------------
 ...zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch | 56 -----------------
 ...zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch | 70 ----------------------
 3 files changed, 170 deletions(-)

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch
deleted file mode 100644
index 51a81363ea..0000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e2060f922f8526aecf437de4cc4dff4c3cdfae16 Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Tue, 15 May 2012 23:19:32 -0400
-Subject: [PATCH] Revert Fix ASSERTION(!dsl_pool_sync_context(tx->tx_pool))
-
-Commit eec8164771bee067c3cd55ed0a16dadeeba276de worked around an issue
-involving direct reclaim through the use of PF_MEMALLOC.   Since we
-are reworking thing to use KM_PUSHPAGE so that swap works, we revert
-this patch in favor of the use of KM_PUSHPAGE in the affected areas.
-
-Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Issue #726
----
- module/zfs/txg.c |   13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/module/zfs/txg.c b/module/zfs/txg.c
-index 5021e44..8d037f7 100644
---- a/module/zfs/txg.c
-+++ b/module/zfs/txg.c
-@@ -372,19 +372,6 @@
- 	callb_cpr_t cpr;
- 	uint64_t start, delta;
- 
--#ifdef _KERNEL
--	/*
--	 * Disable the normal reclaim path for the txg_sync thread.  This
--	 * ensures the thread will never enter dmu_tx_assign() which can
--	 * otherwise occur due to direct reclaim.  If this is allowed to
--	 * happen the system can deadlock.  Direct reclaim call path:
--	 *
--	 *   ->shrink_icache_memory->prune_icache->dispose_list->
--	 *   clear_inode->zpl_clear_inode->zfs_inactive->dmu_tx_assign
--	 */
--	current->flags |= PF_MEMALLOC;
--#endif /* _KERNEL */
--
- 	txg_thread_enter(tx, &cpr);
- 
- 	start = delta = 0;
--- 
-1.7.10
-

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch
deleted file mode 100644
index 0a4fd26040..0000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 78d26b8497b3845fc8130981c76214d6788f7a9d Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Mon, 7 May 2012 14:14:45 -0400
-Subject: [PATCH] Revert Fix zpl_writepage() deadlock
-
-The commit, cfc9a5c88f91f7b4d606fce89505e1f404691ea5, to fix deadlocks
-in zpl_writepage() relied on PF_MEMALLOC.   That had the effect of
-disabling the direct reclaim path on all allocations originating from
-calls to this function, but it failed to address the actual cause of
-those deadlocks.  This led to the same deadlocks being observed with
-swap on zvols, but not with swap on the loop device, which exercises
-this code.
-
-The use of PF_MEMALLOC also had the side effect of permitting
-allocations to be made from ZONE_DMA in instances that did not require
-it.  This contributes to the possibility of panics caused by depletion
-of pages from ZONE_DMA.
-
-As such, we revert this patch in favor of a proper fix for both issues.
-
-Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Issue #726
----
- module/zfs/zpl_file.c |   15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c
-index 5ac41c9..2e9f72a 100644
---- a/module/zfs/zpl_file.c
-+++ b/module/zfs/zpl_file.c
-@@ -358,20 +358,7 @@
- 	ASSERT(PageLocked(pp));
- 	ASSERT(!PageWriteback(pp));
- 
--	/*
--	 * Disable the normal reclaim path for zpl_putpage().  This
--	 * ensures that all memory allocations under this call path
--	 * will never enter direct reclaim.  If this were to happen
--	 * the VM might try to write out additional pages by calling
--	 * zpl_putpage() again resulting in a deadlock.
--	 */
--	if (current->flags & PF_MEMALLOC) {
--		(void) zfs_putpage(mapping->host, pp, wbc);
--	} else {
--		current->flags |= PF_MEMALLOC;
--		(void) zfs_putpage(mapping->host, pp, wbc);
--		current->flags &= ~PF_MEMALLOC;
--	}
-+	(void) zfs_putpage(mapping->host, pp, wbc);
- 
- 	return (0);
- }
--- 
-1.7.10
-

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch
deleted file mode 100644
index 2eb85754b0..0000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a1c889dd6fb04d70439074a9399c9ea8f29f2cdb Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Wed, 16 May 2012 18:16:02 -0400
-Subject: [PATCH] Revert Disable direct reclaim for z_wr_* threads
-
-This commit used PF_MEMALLOC to prevent a memory reclaim deadlock.
-However, commit 49be0ccf1fdc2ce852271d4d2f8b7a9c2c4be6db eliminated
-the invocation of __cv_init(), which was the cause of the deadlock.
-PF_MEMALLOC has the side effect of permitting pages from ZONE_DMA
-to be allocated.  The use of PF_MEMALLOC was found to cause stability
-problems when doing swap on zvols. Since this technique is known to
-cause problems and no longer fixes anything, we revert it.
-
-Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Issue #726
----
- include/sys/zfs_context.h |    1 -
- module/zfs/spa.c          |    9 +++------
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
-index e4af6fc..77dded3 100644
---- a/include/sys/zfs_context.h
-+++ b/include/sys/zfs_context.h
-@@ -382,7 +382,6 @@ extern kstat_t *kstat_create(char *, int,
- #define	TASKQ_DYNAMIC		0x0004	/* Use dynamic thread scheduling */
- #define	TASKQ_THREADS_CPU_PCT	0x0008	/* Scale # threads by # cpus */
- #define	TASKQ_DC_BATCH		0x0010	/* Mark threads as batch */
--#define	TASKQ_NORECLAIM		0x0020	/* Disable direct memory reclaim */
- 
- #define	TQ_SLEEP	KM_SLEEP	/* Can block for memory */
- #define	TQ_NOSLEEP	KM_NOSLEEP	/* cannot block for memory; may fail */
-diff --git a/module/zfs/spa.c b/module/zfs/spa.c
-index c33a33a..436cd26 100644
---- a/module/zfs/spa.c
-+++ b/module/zfs/spa.c
-@@ -617,8 +617,9 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- 
- static taskq_t *
- spa_taskq_create(spa_t *spa, const char *name, enum zti_modes mode,
--    uint_t value, uint_t flags)
-+    uint_t value)
- {
-+	uint_t flags = TASKQ_PREPOPULATE;
- 	boolean_t batch = B_FALSE;
- 
- 	switch (mode) {
-@@ -668,17 +669,13 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- 			const zio_taskq_info_t *ztip = &zio_taskqs[t][q];
- 			enum zti_modes mode = ztip->zti_mode;
- 			uint_t value = ztip->zti_value;
--			uint_t flags = 0;
- 			char name[32];
- 
--			if (t == ZIO_TYPE_WRITE)
--				flags |= TASKQ_NORECLAIM;
--
- 			(void) snprintf(name, sizeof (name),
- 			    "%s_%s", zio_type_name[t], zio_taskq_types[q]);
- 
- 			spa->spa_zio_taskq[t][q] =
--			    spa_taskq_create(spa, name, mode, value, flags);
-+			    spa_taskq_create(spa, name, mode, value);
- 		}
- 	}
- }
--- 
-1.7.10
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/

[Sam James]

commit:     8102a2df6ce57d8c3a0d4b45e5d05627ca8bd10a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 18 07:07:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 07:15:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8102a2df

sys-fs/zfs-kmod: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25080
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/zfs-kmod/files/2.1.3-werror.patch | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/sys-fs/zfs-kmod/files/2.1.3-werror.patch b/sys-fs/zfs-kmod/files/2.1.3-werror.patch
deleted file mode 100644
index b4aba47d8324..000000000000
--- a/sys-fs/zfs-kmod/files/2.1.3-werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/835646
-https://github.com/openzfs/zfs/commit/7b215d93bcc0a72d7020ccc050c64f39aa7f2be8.patch
-
-From: Ryan Moeller <freqlabs@FreeBSD.org>
-Date: Thu, 17 Mar 2022 13:18:23 -0400
-Subject: [PATCH] Fix module build with -Werror
-
-This is a direct commit to zfs-2.1-release to fix release builds that
-error out on an unused variable.  The issue is avoided on master by a
-huge series of commits that change how the ASSERT macros work, but that
-is not feasible to backport.
-
-Reviewed-by: Tony Hutter <hutter2@llnl.gov>
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-by: Igor Kozhukhov <igor@dilos.org>
-Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
-Closes #13194
-Closes #13196
---- a/module/zfs/arc.c
-+++ b/module/zfs/arc.c
-@@ -1205,7 +1205,7 @@ static void
- hdr_l2only_dest(void *vbuf, void *unused)
- {
- 	(void) unused;
--	arc_buf_hdr_t *hdr = vbuf;
-+	arc_buf_hdr_t *hdr __maybe_unused = vbuf;
- 
- 	ASSERT(HDR_EMPTY(hdr));
- 	arc_space_return(HDR_L2ONLY_SIZE, ARC_SPACE_L2HDRS);
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/

[Georgy Yakovlev]

commit:     e5c293ab58539c16bd0ccde7fba01da09651474a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 23:19:00 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 23:19:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c293ab

sys-fs/zfs-kmod: drop unused patch

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-fs/zfs-kmod/files/2.1.5-build-issues.patch | 74 --------------------------
 1 file changed, 74 deletions(-)

diff --git a/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch b/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch
deleted file mode 100644
index cca6561b16f7..000000000000
--- a/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://github.com/openzfs/zfs/commit/a6e8113fed8a508ffda13cf1c4d8da99a4e8133a
-https://github.com/openzfs/zfs/commit/60e389ca10085acfa7cd35f79ab4465d968a942f
-Cherry-picked from https://github.com/openzfs/zfs/pull/13575
-
-https://bugs.gentoo.org/855182
---- a/config/always-compiler-options.m4
-+++ b/config/always-compiler-options.m4
-@@ -205,6 +205,29 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_OMIT_FRAME_POINTER], [
- 	AC_SUBST([NO_OMIT_FRAME_POINTER])
- ])
- 
-+dnl #
-+dnl # Check if cc supports -Winfinite-recursion option.
-+dnl #
-+AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION], [
-+	AC_MSG_CHECKING([whether $CC supports -Winfinite-recursion])
-+
-+	saved_flags="$CFLAGS"
-+	CFLAGS="$CFLAGS -Werror -Winfinite-recursion"
-+
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
-+		INFINITE_RECURSION=-Winfinite-recursion
-+		AC_DEFINE([HAVE_INFINITE_RECURSION], 1,
-+			[Define if compiler supports -Winfinite-recursion])
-+		AC_MSG_RESULT([yes])
-+	], [
-+		INFINITE_RECURSION=
-+		AC_MSG_RESULT([no])
-+	])
-+
-+	CFLAGS="$saved_flags"
-+	AC_SUBST([INFINITE_RECURSION])
-+])
-+
- dnl #
- dnl # Check if cc supports -fno-ipa-sra option.
- dnl #
---- a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -211,6 +211,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
- 
- 	ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE
- 	ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
-+	ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION
- 	ZFS_AC_CONFIG_ALWAYS_CC_IMPLICIT_FALLTHROUGH
- 	ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN
- 	ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION
---- a/module/lua/ldo.c
-+++ b/module/lua/ldo.c
-@@ -168,6 +168,13 @@ static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
-   L->top = oldtop + 1;
- }
- 
-+/*
-+ * Silence infinite recursion warning which was added to -Wall in gcc 12.1
-+ */
-+#if defined(HAVE_INFINITE_RECURSION)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Winfinite-recursion"
-+#endif
- 
- l_noret luaD_throw (lua_State *L, int errcode) {
-   if (L->errorJmp) {  /* thread has an error handler? */
-@@ -190,6 +197,10 @@ l_noret luaD_throw (lua_State *L, int errcode) {
-   }
- }
- 
-+#if defined(HAVE_INFINITE_RECURSION)
-+#pragma GCC diagnostic pop
-+#endif
-+
- 
- int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
-   unsigned short oldnCcalls = L->nCcalls;

[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/

[Conrad Kostecki]

commit:     8f8f5aa6c09915bf646550fde077b06c97891971
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul  4 09:58:19 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul  4 22:16:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8f5aa6

sys-fs/zfs-kmod: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31737
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch | 53 ------------------------
 1 file changed, 53 deletions(-)

diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch
deleted file mode 100644
index 2e47c5bcc093..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/openzfs/zfs/commit/d30577c9dd811688f2609ad532b011b99bceb485
-
-From d30577c9dd811688f2609ad532b011b99bceb485 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
-Date: Sat, 12 Mar 2022 00:26:46 +0100
-Subject: [PATCH] fgrep -> grep -F
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-by: John Kennedy <john.kennedy@delphix.com>
-Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
-Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
-Closes #13259
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -394,11 +394,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
- 	utsrelease1=$kernelbuild/include/linux/version.h
- 	utsrelease2=$kernelbuild/include/linux/utsrelease.h
- 	utsrelease3=$kernelbuild/include/generated/utsrelease.h
--	AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
-+	AS_IF([test -r $utsrelease1 && grep -qF UTS_RELEASE $utsrelease1], [
- 		utsrelease=$utsrelease1
--	], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
-+	], [test -r $utsrelease2 && grep -qF UTS_RELEASE $utsrelease2], [
- 		utsrelease=$utsrelease2
--	], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
-+	], [test -r $utsrelease3 && grep -qF UTS_RELEASE $utsrelease3], [
- 		utsrelease=$utsrelease3
- 	])
- 
---- a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -173,7 +173,7 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
- ])
- 
- AC_DEFUN([ZFS_AC_DEBUG_INVARIANTS_DETECT_FREEBSD], [
--	AS_IF([sysctl -n kern.conftxt | fgrep -qx $'options\tINVARIANTS'],
-+	AS_IF([sysctl -n kern.conftxt | grep -Fqx $'options\tINVARIANTS'],
- 		[enable_invariants="yes"],
- 		[enable_invariants="no"])
- ])
---- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-@@ -120,5 +120,5 @@ function check_while_waiting
- # Whether any vdev in the given pool is initializing
- function is_vdev_initializing # pool
- {
--	zpool status -i "$1" | grep 'initialized, started' >/dev/null
-+	zpool status -i "$1" | grep -q 'initialized, started'
- }
-