From 5ab6b48d7f63a19546a91f1168bcacb4d9b7c014 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 30 Nov 2023 21:51:15 -0500 Subject: [PATCH 1/2] zfs-lts: update to 2.1.14. --- ...ault-zfs_dmu_offset_next_sync-to-off.patch | 45 ------------------- srcpkgs/zfs-lts/template | 6 +-- 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 srcpkgs/zfs-lts/patches/default-zfs_dmu_offset_next_sync-to-off.patch diff --git a/srcpkgs/zfs-lts/patches/default-zfs_dmu_offset_next_sync-to-off.patch b/srcpkgs/zfs-lts/patches/default-zfs_dmu_offset_next_sync-to-off.patch deleted file mode 100644 index ae21df42ce3a3..0000000000000 --- a/srcpkgs/zfs-lts/patches/default-zfs_dmu_offset_next_sync-to-off.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2b266bd36980caefe353411bd56b2487c44aeb6e Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 24 Nov 2023 21:38:06 +0000 -Subject: [PATCH] Disable zfs_dmu_offset_next_sync tunable by default - -As a mitigation until more is understood and fixes are tested & reviewed, change -the default of zfs_dmu_offset_next_sync from 1 to 0, as it was before -05b3eb6d232009db247882a39d518e7282630753. - -There are no reported cases of The Bug being hit with zfs_dmu_offset_next_sync=1: -that does not mean this is a cure or a real fix, but it _appears_ to be at least -effective in reducing the chances of it happening. By itself, it's a safe change -anyway, so it feels worth us doing while we wait. - -Bug: https://github.com/openzfs/zfs/issues/11900 -Bug: https://github.com/openzfs/zfs/issues/15526 -Bug: https://bugs.gentoo.org/917224 -Signed-off-by: Sam James ---- -diff --git a/man/man4/zfs.4 b/man/man4/zfs.4 -index 0c60a9c8e..8c14e670b 100644 ---- a/man/man4/zfs.4 -+++ b/man/man4/zfs.4 -@@ -1646,7 +1646,7 @@ Allow no-operation writes. - The occurrence of nopwrites will further depend on other pool properties - .Pq i.a. the checksumming and compression algorithms . - . --.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 1 Ns | Ns 0 Pq int -+.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 0 Ns | Ns 1 Pq int - Enable forcing TXG sync to find holes. - When enabled forces ZFS to sync data when - .Sy SEEK_HOLE No or Sy SEEK_DATA -diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c -index 96e98a42e..c1fd57c9e 100644 ---- a/module/zfs/dmu.c -+++ b/module/zfs/dmu.c -@@ -80,7 +80,7 @@ unsigned long zfs_per_txg_dirty_frees_percent = 30; - * Disabling this option will result in holes never being reported in dirty - * files which is always safe. - */ --int zfs_dmu_offset_next_sync = 1; -+int zfs_dmu_offset_next_sync = 0; - - /* - * Limit the amount we can prefetch with one call to this amount. This diff --git a/srcpkgs/zfs-lts/template b/srcpkgs/zfs-lts/template index 4f0cd99fab499..91e4f66a623e9 100644 --- a/srcpkgs/zfs-lts/template +++ b/srcpkgs/zfs-lts/template @@ -1,7 +1,7 @@ # Template file for 'zfs-lts' pkgname=zfs-lts -version=2.1.13 -revision=2 +version=2.1.14 +revision=1 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d @@ -16,7 +16,7 @@ maintainer="Toyam Cox " license="CDDL-1.0" homepage="https://openzfs.github.io/openzfs-docs/" distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz" -checksum=06b24cbb3cbc1554e2edf2fcd71d1f8bec4febf4412aeac17070877c44302abd +checksum=509fed100e73477621bfb56c58346a3306727dbb6f7e017ba714101babb6ea3f # dkms must be before initramfs-regenerate to build modules before images triggers="dkms initramfs-regenerate" dkms_modules="zfs ${version}" From 82eb5358464d07ac2529bfdb2e62e6adff5aafb1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 30 Nov 2023 21:53:06 -0500 Subject: [PATCH 2/2] zfs: update to 2.2.2. --- ...ault-zfs_dmu_offset_next_sync-to-off.patch | 51 ------------------- srcpkgs/zfs/template | 6 +-- 2 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 srcpkgs/zfs/patches/default-zfs_dmu_offset_next_sync-to-off.patch diff --git a/srcpkgs/zfs/patches/default-zfs_dmu_offset_next_sync-to-off.patch b/srcpkgs/zfs/patches/default-zfs_dmu_offset_next_sync-to-off.patch deleted file mode 100644 index b452304f49c48..0000000000000 --- a/srcpkgs/zfs/patches/default-zfs_dmu_offset_next_sync-to-off.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2b266bd36980caefe353411bd56b2487c44aeb6e Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 24 Nov 2023 21:38:06 +0000 -Subject: [PATCH] Disable zfs_dmu_offset_next_sync tunable by default - -As a mitigation until more is understood and fixes are tested & reviewed, change -the default of zfs_dmu_offset_next_sync from 1 to 0, as it was before -05b3eb6d232009db247882a39d518e7282630753. - -There are no reported cases of The Bug being hit with zfs_dmu_offset_next_sync=1: -that does not mean this is a cure or a real fix, but it _appears_ to be at least -effective in reducing the chances of it happening. By itself, it's a safe change -anyway, so it feels worth us doing while we wait. - -Bug: https://github.com/openzfs/zfs/issues/11900 -Bug: https://github.com/openzfs/zfs/issues/15526 -Bug: https://bugs.gentoo.org/917224 -Signed-off-by: Sam James ---- - man/man4/zfs.4 | 2 +- - module/zfs/dmu.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man/man4/zfs.4 b/man/man4/zfs.4 -index 5daf27e9d..d70c8921c 100644 ---- a/man/man4/zfs.4 -+++ b/man/man4/zfs.4 -@@ -1677,7 +1677,7 @@ Allow no-operation writes. - The occurrence of nopwrites will further depend on other pool properties - .Pq i.a. the checksumming and compression algorithms . - . --.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 1 Ns | Ns 0 Pq int -+.It Sy zfs_dmu_offset_next_sync Ns = Ns Sy 0 Ns | Ns 1 Pq int - Enable forcing TXG sync to find holes. - When enabled forces ZFS to sync data when - .Sy SEEK_HOLE No or Sy SEEK_DATA -diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c -index a63aac51f..2cdbd4dc5 100644 ---- a/module/zfs/dmu.c -+++ b/module/zfs/dmu.c -@@ -82,7 +82,7 @@ static uint_t zfs_per_txg_dirty_frees_percent = 30; - * Disabling this option will result in holes never being reported in dirty - * files which is always safe. - */ --static int zfs_dmu_offset_next_sync = 1; -+static int zfs_dmu_offset_next_sync = 0; - - /* - * Limit the amount we can prefetch with one call to this amount. This --- -2.43.0 diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index 37b70fe5bb6fd..62671dd2396f6 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -1,7 +1,7 @@ # Template file for 'zfs' pkgname=zfs -version=2.2.1 -revision=2 +version=2.2.2 +revision=1 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d @@ -16,7 +16,7 @@ maintainer="Toyam Cox " license="CDDL-1.0" homepage="https://openzfs.github.io/openzfs-docs/" distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz" -checksum=4ff2de43d39710283ae8ff1744aa96e6cdc83c8efe86a715294d4f6bc34a8e8e +checksum=76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9 # dkms must be before initramfs-regenerate to build modules before images triggers="dkms initramfs-regenerate" dkms_modules="zfs ${version}"