Merge pull request #271328 from adamcstephens/zfs/2.2.2

zfs: 2.2.1 -> 2.2.2, zfs_2_1: 2.1.13 -> 2.1.14

pkgs/os-specific/linux/zfs/2_1.nix

@@ -5,7 +5,6 @@
 , removeLinuxDRM ? false
 , lib
 , nixosTests
-, fetchpatch
 , ...
 } @ args:
 
@@ -28,18 +27,9 @@ callPackage ./generic.nix args {
 
   # This is a fixed version to the 2.1.x series, move only
   # if the 2.1.x series moves.
-  version = "2.1.13";
+  version = "2.1.14";
 
-  extraPatches = [
+  hash = "sha256-RVAoZbV9yclGuN+D37SB6UCRFbbLEpBoyrQOQCVsQwE=";
-    (fetchpatch {
-      # https://github.com/openzfs/zfs/pull/15571
-      # Remove when it's backported to 2.1.x.
-      url = "https://github.com/robn/zfs/commit/617c990a4cf1157b0f8332f35672846ad16ca70a.patch";
-      hash = "sha256-j5YSrud7BaWk2npBl31qwFFLYltbut3CUjI1cjZOpag=";
-    })
-  ];
-
-  hash = "sha256-tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc=";
 
   tests = [
     nixosTests.zfs.series_2_1

pkgs/os-specific/linux/zfs/patches/disable-zfs-dmu-offset-next-sync-by-default-v2-2.patch

@@ -1,44 +0,0 @@
-From 3ba4ff328ab001d88d7714087d8a89687bc68312 Mon Sep 17 00:00:00 2001
-From: Andrew Marshall <andrew@johnandrewmarshall.com>
-Date: Sun, 26 Nov 2023 12:46:18 -0500
-Subject: [PATCH] Disable zfs_dmu_offset_next_sync tunable by default
-
-This helps mitigate a data corruption bug. This was previously defaulted
-to zero, so doing so seems safe.
-
-See https://github.com/openzfs/zfs/issues/11900
-See https://github.com/openzfs/zfs/issues/15526
----
- 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 4ec52a2fb..2a69a8f54 100644
---- a/man/man4/zfs.4
-+++ b/man/man4/zfs.4
-@@ -1660,7 +1660,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 ddb29020b..5d37b6f92 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.42.0
-

pkgs/os-specific/linux/zfs/stable.nix

@@ -3,7 +3,6 @@
 , stdenv
 , linuxKernel
 , removeLinuxDRM ? false
-, fetchpatch
 , nixosTests
 , ...
 } @ args:
@@ -26,16 +25,12 @@ callPackage ./generic.nix args {
     else linuxKernel.packages.linux_6_1;
 
   # this package should point to the latest release.
-  version = "2.2.1";
+  version = "2.2.2";
-
-  extraPatches = [
-    ./patches/disable-zfs-dmu-offset-next-sync-by-default-v2-2.patch
-  ];
 
   tests = [
     nixosTests.zfs.installer
     nixosTests.zfs.stable
   ];
 
-  hash = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4=";
+  hash = "sha256-CqhETAwhWMhbld5ib3Rz1dxms+GQbLwjEZw/V7U/2nE=";
 }

pkgs/os-specific/linux/zfs/unstable.nix

@@ -15,7 +15,8 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfsUnstable";
   # check the release notes for compatible kernels
-  kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM
+  kernelCompatible =
+    if stdenv'.isx86_64 || removeLinuxDRM
     then kernel.kernelOlder "6.7"
     else kernel.kernelOlder "6.2";
 
@@ -27,16 +28,12 @@ callPackage ./generic.nix args {
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.2.1";
+  version = "2.2.2";
-
-  hash = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4=";
 
   isUnstable = true;
   tests = [
     nixosTests.zfs.unstable
   ];
 
-  extraPatches = [
+  hash = "sha256-CqhETAwhWMhbld5ib3Rz1dxms+GQbLwjEZw/V7U/2nE=";
-    ./patches/disable-zfs-dmu-offset-next-sync-by-default-v2-2.patch
-  ];
 }