Semi-automated update for kernel 6.7.1.zen1-1 + zfs 2.2.2

3 files changed, 88 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39bb22231870..b95f8db4fe58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = zfs-linux-zen
-	pkgver = 2.2.2_6.7.zen3.1
+	pkgver = 2.2.2_6.7.1.zen1.1
 	pkgrel = 1
 	url = https://openzfs.org/
 	arch = x86_64
 	license = CDDL
-	makedepends = linux-zen-headers=6.7.zen3-1
+	makedepends = linux-zen-headers=6.7.1.zen1-1
 	depends = kmod
 	depends = zfs-utils=2.2.2
-	depends = linux-zen=6.7.zen3-1
+	depends = linux-zen=6.7.1.zen1-1
 	source = https://github.com/openzfs/zfs/releases/download/zfs-2.2.2/zfs-2.2.2.tar.gz
 	source = linux-6.7-compat.patch
 	sha256sums = 76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9
-	sha256sums = 5afd5ce236dfe0eb96abbe61a61c211623cb4a89c9fbb0be5f9f400a0970719e
+	sha256sums = 43bca1a6717bfc77d42a4c51656c38674c6be8d7ec46f04c7febcdafd9295916
 
 pkgname = zfs-linux-zen
 	pkgdesc = Kernel modules for the Zettabyte File System.
diff --git a/PKGBUILD b/PKGBUILD
index 4c5e6350af18..89eebfa537fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,8 +18,8 @@
 pkgbase="zfs-linux-zen"
 pkgname=("zfs-linux-zen" "zfs-linux-zen-headers")
 _zfsver="2.2.2"
-_kernelver="6.7.zen3-1"
-_kernelver_full="6.7.0.zen3-1"
+_kernelver="6.7.1.zen1-1"
+_kernelver_full="6.7.1.zen1-1"
 _extramodules="${_kernelver_full/.zen/-zen}-zen"
 
 pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
@@ -28,7 +28,7 @@ makedepends=("linux-zen-headers=${_kernelver}")
 arch=("x86_64")
 url="https://openzfs.org/"
 source=("https://github.com/openzfs/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.tar.gz" "linux-6.7-compat.patch")
-sha256sums=("76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9" "5afd5ce236dfe0eb96abbe61a61c211623cb4a89c9fbb0be5f9f400a0970719e")
+sha256sums=("76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9" "43bca1a6717bfc77d42a4c51656c38674c6be8d7ec46f04c7febcdafd9295916")
 license=("CDDL")
 depends=("kmod" "zfs-utils=${_zfsver}" "linux-zen=${_kernelver}")
 prepare() {
diff --git a/linux-6.7-compat.patch b/linux-6.7-compat.patch
index 766ca929cc90..e05470626d20 100644
--- a/linux-6.7-compat.patch
+++ b/linux-6.7-compat.patch
@@ -883,3 +883,84 @@ index 55cdbba5b5eb..02dd80c06062 100644
  }
 
  int
+
+
+ From 49b2dee41a483ebc187ab2b42a6250242298b71b Mon Sep 17 00:00:00 2001
+From: Rob Norris <robn@despairlabs.com>
+Date: Mon, 15 Jan 2024 09:01:39 +1100
+Subject: [PATCH 1/2] tests/ctime: ensure times change by the right amount
+
+Previously, we only checked if the times changed at all, which missed a
+bug where the atime was being set to an undefined value.
+
+Now ensure the times change by two seconds (or thereabouts), ensuring we
+catch cases where we set the time to something bonkers
+
+Signed-off-by: Rob Norris <robn@despairlabs.com>
+Sponsored-by: https://despairlabs.com/sponsor/
+---
+ tests/zfs-tests/cmd/ctime.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/tests/zfs-tests/cmd/ctime.c b/tests/zfs-tests/cmd/ctime.c
+index 0f5d81aea613..5ff1cea8a869 100644
+--- a/tests/zfs-tests/cmd/ctime.c
++++ b/tests/zfs-tests/cmd/ctime.c
+@@ -362,12 +362,20 @@ main(void)
+ 			return (1);
+ 		}
+
+-		if (t1 == t2) {
+-			(void) fprintf(stderr, "%s: t1(%ld) == t2(%ld)\n",
++
++		/*
++		 * Ideally, time change would be exactly two seconds, but allow
++		 * a little slack in case of scheduling delays or similar.
++		 */
++		long delta = (long)t2 - (long)t1;
++		if (delta < 2 || delta > 4) {
++			(void) fprintf(stderr,
++			    "%s: BAD time change: t1(%ld), t2(%ld)\n",
+ 			    timetest_table[i].name, (long)t1, (long)t2);
+ 			return (1);
+ 		} else {
+-			(void) fprintf(stderr, "%s: t1(%ld) != t2(%ld)\n",
++			(void) fprintf(stderr,
++			    "%s: good time change: t1(%ld), t2(%ld)\n",
+ 			    timetest_table[i].name, (long)t1, (long)t2);
+ 		}
+ 	}
+
+From 34c12f76f46ba91ff2a7cd8d2855524844e0cadc Mon Sep 17 00:00:00 2001
+From: Rob Norris <robn@despairlabs.com>
+Date: Sun, 14 Jan 2024 13:46:06 +1100
+Subject: [PATCH 2/2] zfs_setattr: fix atime update
+
+In db4fc559c I messed up and changed this bit of code to set the inode
+atime to an uninitialised value, when actually it was just supposed to
+loading the atime from the inode to be stored in the SA. This changes it
+to what it should have been.
+
+Signed-off-by: Rob Norris <robn@despairlabs.com>
+Sponsored-by: https://despairlabs.com/sponsor/
+Fixes: #15762
+---
+ module/os/linux/zfs/zfs_vnops_os.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/module/os/linux/zfs/zfs_vnops_os.c b/module/os/linux/zfs/zfs_vnops_os.c
+index 2a766a585b70..b7b89b8afc56 100644
+--- a/module/os/linux/zfs/zfs_vnops_os.c
++++ b/module/os/linux/zfs/zfs_vnops_os.c
+@@ -2439,9 +2439,8 @@ zfs_setattr(znode_t *zp, vattr_t *vap, int flags, cred_t *cr, zidmap_t *mnt_ns)
+
+ 	if ((mask & ATTR_ATIME) || zp->z_atime_dirty) {
+ 		zp->z_atime_dirty = B_FALSE;
+-		inode_timespec_t tmp_atime;
++		inode_timespec_t tmp_atime = zpl_inode_get_atime(ip);
+ 		ZFS_TIME_ENCODE(&tmp_atime, atime);
+-		zpl_inode_set_atime_to_ts(ZTOI(zp), tmp_atime);
+ 		SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_ATIME(zfsvfs), NULL,
+ 		    &atime, sizeof (atime));
+ 	}
+