zfs: update to v2.1.5

Updating to 2.1.5 primarily for kernel 5.19+ support. We refresh
one patch, and pick up the following changes:

Changes
  - Remove install of zfs-load-module.service for dracut #13574
  - FreeBSD: Silence clang unused-but-set-variable
  - Improve sorted scan memory accounting #13537
  - Corrected edge case in uncompressed ARC->L2ARC handling #13375
  - Remove wrong assertion in log spacemap #13486 #13513
  - libzfs: Fail making a dataset handle gracefully #13077
  - libzfs: mount: don't leak mnt_param_t if mnt_func fails #12968
  - Reject zfs send -RI with nonexistent fromsnap #12574 #12575
  - Linux 5.18 compat: META #13527
  - autoconf: AC_MSG_CHECKING consistency #13529
  - Linux 5.19 compat: asm/fpu/internal.h #13529
  - Linux 5.19 compat: zap_flags_t conflict #13515
  - Linux 5.19 compat: bdev_start_io_acct() / bdev_end_io_acct() #13515
  - Linux 5.19 compat: aops->read_folio() #13515
  - Linux 5.19 compat: blkdev_issue_secure_erase() #13515
  - Linux 5.19 compat: bdev_max_secure_erase_sectors() #13515
  - Linux 5.19 compat: bdev_max_discard_sectors() #13515
  - Linux 5.18 compat: bio_alloc() #13515
  - Silence unused-but-set-variable warning #13507
  - zed: support subject as header in zed_notify_email() #13440
  - rpm: Keep debug symbols if configured with '--enable-debuginfo' #13500
  - FreeBSD: libspl: Add locking around statfs globals #13484
  - Standardize RHEL version check in packages #13501
  - Modified ncompress requirement in RPM to exclude RHEL9 #13480 #13490
  - zed: Take no action on scrub/resilver checksum errors #13499
  - zdb: Fix handling of nul termination in symlink targets #13482
  - automake: don't install /e/d/zfs or /e/z/zfs-functions +x #13496
  - Multiple dracut module install script cleanups #13010
  - Remove absolute paths to udev rules and binaries for dracut #13010
  - Make dracut fail if essential files cannot be installed #13010
  - Make better use of dracut functions when building initramfs #13010
  - Fix compiler warnings about zero-length arrays in inline bitops #13463 #13465
  - Add missing AC_MSG_RESULT(no) to configure #13454
  - abd_os: remove redundant refcount creation for abd_children #13429
  - Fix functions without a prototype #13421
  - FreeBSD: use zero_region instead of allocating a dedicated page #13406
  - autoconf: Fail when __copy_from_user_inatomic is a non-GPL symbol #13389
  - PPC get_user workaround #11958 #12590 #13367
  - Adding ZERO_PAGE detection #13199
  - autoconf: Pretend CONFIG_MODULES is always on
  - kbuild: unify modules(_install) for in-tree and external modules #10832 #13361
  - Strengthen Linux kernel capabilities detection #13351
  - zvol_wait: Ignore locked zvols #10662
  - FreeBSD: Implement hole-punching support #12458
  - module: zstd: check we don't leak symbols; regenerate symbol map #12988 #13209
  - man: zpool-import.8: -d -or -c #13437
  - Reduce dbuf_find() lock contention #13405
  - contrib: dracut: remove getargbool polyfill #13291
  - Add dracut.zfs.7 #13291
  - contrib: dracut: zfs-needshutdown: don't list #13291
  - contrib: dracut: zfs-{rollback,snapshot}-bootfs: order after key loading #13291
  - contrib: dracut: don't require essentials to be under the same encroot #13291
  - contrib: dracut: inline single-use import_pool, move single-use ask_for_password #13291
  - contrib: dracut: zfs-lib: remove find_bootfs #13291
  - contrib: dracut: zfs-lib: simplify ask_for_password #13291
  - contrib; dracut: flatten zfs-load-key, simplify zfs-env-bootfs #13291
  - contrib; dracut: centralise root= parsing, actually support root=s #13291
  - contrib: dracut: parse-zfs: stop pretending we support FILESYSTEM= #13291
  - contrib: dracut: parse-zfs: drop initqueue-finished for i/f #13291
  - contrib/dracut: zfs-lib: export_all: replace with inline zpool export -a #13093
  - Remove REMAKE_INITRD #12781
  - Python 3.10 fixes, part 2 #12045 #12673
  - Silence unused-but-set-variable warnings
  - module: zfs: freebsd: fix unused, remove argsused #12844
  - FreeBSD: remove unused variable
  - zvol: remove unused variable #12917
  - fm: remove unused variables #12917
  - zvol: remove unused variable #12917
  - module/zfs: vdev_removal: spa_vdev_remove_thread: remove unused variable #12187
  - module/zfs: vdev_indirect: vdev_indirect_repair: remove unused variable #12187
  - module/zfs: dbuf: dbuf_read_impl: remove unused variable #12187
  - module/zfs: arc: arc_hdr_realloc_crypt: remove unused variables #12187
  - libzfs: zfs_send: remove unused variable #12187
  - libzutil: zpool_find_config: remove unused variable #12187
  - Skip spacemaps reading in case of pool readonly import #9095 #12687
  - zfs: holds: dequadratify #13372 #13373
  - Linux 5.18 compat: replace __set_page_dirty_nobuffers #13325 #13380
  - Fix O_APPEND for Linux 3.15 and older kernels #13370 #13377
  - Linux 5.18 compat: kobj_type.default_attrs replaced with default_groups #13357
  - FreeBSD: Fix translation from ABD to physical pages.
  - Corrected oversight in ZERO_RANGE behavior #13329 #13338
  - Document zfs inherit -S's interaction with noninheritable properties #11894 #13335
  - Linux 5.17 compat: GENHD_FL_EXT_DEVT / GENHD_FL_NO_PART_SCAN #13294 #13297
  - FreeBSD: Return Mach error codes from VOP_(GET|PUT)PAGES #13311
  - FreeBSD: Parameterize ZFS_ENTER/ZFS_VERIFY_VP with an error code #13311
  - libzfs: import: zpool_clear_label: actually fail if clearing l2arc header fails #13304
  - libzfs: sendrecv: always cancel progress thread in zfs_send_one() #11560 #13284
  - Linux 5.18 compat: use address_space_operations->readahead #13278
  - Linux 5.18 compat: blkg_tryget is moved to private headers #13278
  - Linux 5.18 compat: replace genhd.h with blkdev.h includes #13251
  - Linux 5.18 compat: 4-argument bio_alloc() #13251
  - FreeBSD: Use NDFREE_PNBUF if available #13277
  - Export minimal zfs_refcount interfaces #12613
  - Default to zfs_dmu_offset_next_sync=1 #12746
  - etc/systemd/zfs-mount-generator: serialise, handle keylocation=http[s]:// #12138
  - libzfs: diff: stream_bytes: use fputc, %hho formats chars #12829
  - zfs, libzfs: diff: accept -h/ZFS_DIFF_NO_MANGLE, disabling path escaping #12829

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 8 insertions, 10 deletions

diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch b/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch
index 8bb8b9479a..80955b3ca0 100644
--- a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch
+++ b/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch
@@ -1,4 +1,4 @@
-From 54883e714b7fd1e7f4ce47eb1fc09adff35d561e Mon Sep 17 00:00:00 2001
+From cc0cd6f71f6ef96fca2d7b730a3f0f6722fec696 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 7 May 2022 12:15:22 -0700
 Subject: [PATCH] Define strndupa if it does not exist
@@ -7,17 +7,18 @@ musl e.g. does not supply strndupa, unlike glibc
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  etc/systemd/system-generators/zfs-mount-generator.c | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 diff --git a/etc/systemd/system-generators/zfs-mount-generator.c b/etc/systemd/system-generators/zfs-mount-generator.c
-index b806339..592d2f9 100644
+index f4c6c26..255bee4 100644
 --- a/etc/systemd/system-generators/zfs-mount-generator.c
 +++ b/etc/systemd/system-generators/zfs-mount-generator.c
-@@ -47,6 +47,15 @@
- #define	STRCMP ((int(*)(const void *, const void *))&strcmp)
- #define	PID_T_CMP ((int(*)(const void *, const void *))&pid_t_cmp)
+@@ -193,6 +193,15 @@ fopenat(int dirfd, const char *pathname, int flags,
+ 	return (fdopen(fd, stream_mode));
+ }
  
 +#ifndef strndupa
 +#define strndupa(s, n) \
@@ -29,8 +30,5 @@ index b806339..592d2f9 100644
 +#endif
 +
  static int
- pid_t_cmp(const pid_t *lhs, const pid_t *rhs)
+ line_worker(char *line, const char *cachefile)
  {
--- 
-2.36.0
-
diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.5.bb
index dd676c945c..6aa674c790 100644
--- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb
+++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.5.bb
@@ -7,7 +7,7 @@ HOMEPAGE ="https://github.com/openzfs/zfs"
 SRC_URI = "https://github.com/openzfs/zfs/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
            file://0001-Define-strndupa-if-it-does-not-exist.patch \
 "
-SRC_URI[sha256sum] = "3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6"
+SRC_URI[sha256sum] = "1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c"
 
 # Using both 'module' and 'autotools' classes seems a bit odd, they both
 # define a do_compile function.