update ZFS submodule to 2.0.6

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-09-28 07:36:27 +02:00
12 changed files with 52 additions and 56 deletions
@@ -13,7 +13,7 @@ libpam-zfs_${ZFSPKGVER}_amd64.deb		\
 libuutil3linux_${ZFSPKGVER}_amd64.deb		\
 libzfs4linux_${ZFSPKGVER}_amd64.deb		\
 libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb	\
-libzpool5linux_${ZFSPKGVER}_amd64.deb		\
+libzpool4linux_${ZFSPKGVER}_amd64.deb		\
 zfs-test_${ZFSPKGVER}_amd64.deb			\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb		\
 zfs-zed_${ZFSPKGVER}_amd64.deb
@@ -1,8 +1,8 @@
-zfs-linux (2.1.1-pve1) bullseye; urgency=medium
+zfs-linux (2.0.6-pve1) bullseye; urgency=medium

-  * update ZFS to 2.1.1
+  * update ZFS to 2.0.6

- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 06:16:14 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 07:36:23 +0200

 zfs-linux (2.0.5-pve1) bullseye; urgency=medium

@@ -70,7 +70,7 @@ Depends: libssl-dev | libssl1.0-dev,
         libuutil3linux (= ${binary:Version}),
         libzfs4linux (= ${binary:Version}),
         libzfsbootenv1linux (= ${binary:Version}),
-         libzpool5linux (= ${binary:Version}),
+         libzpool4linux (= ${binary:Version}),
         ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: OpenZFS filesystem development files for Linux
@@ -78,7 +78,7 @@ Description: OpenZFS filesystem development files for Linux
 libraries of OpenZFS filesystem.
 .
 This package includes the development files of libnvpair3, libuutil3,
- libzpool5 and libzfs4, libzfsbootenv1.
+ libzpool4 and libzfs4.

 Package: libzfs4linux
 Section: contrib/libs
@@ -106,7 +106,7 @@ Description: OpenZFS filesystem library for Linux
 .
 The zfsbootenv library provides support for modifying ZFS label information.

-Package: libzpool5linux
+Package: libzpool4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -274,7 +274,7 @@ Suggests: libnvpair3linux-dbgsym,
         libuutil3linux-dbgsym,
         libzfs4linux-dbgsym,
         libzfsbootenv1linux-dbgsym,
-         libzpool5linux-dbgsym,
+         libzpool4linux-dbgsym,
         zfs-test-dbgsym,
         zfsutils-linux-dbgsym,
         zfs-zed-dbgsym,
@@ -14,15 +14,15 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index d3c083f7e..b1c8c7b9d 100644
+index f0317e23e..9a5e9cb17 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
-+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
 
 [Install]
 WantedBy=zfs-import.target
@@ -16,10 +16,10 @@ Forwarded: no need
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
-index 2c8173b3e..ad39292e4 100644
+index 8b2d0c200..118c96547 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
-@@ -49,7 +49,7 @@ install-data-hook:
+@@ -48,6 +48,6 @@ install-data-hook:
 	for f in $(zedconfdefaults); do \
 	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
 	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
@@ -27,4 +27,3 @@ index 2c8173b3e..ad39292e4 100644
 +	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
 	done
 	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
- 
@@ -28,11 +28,11 @@ index 3788543b0..c7ee4ae9a 100755
 
 typeset -i cnt=0
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
-index 1fd21cbf7..791dd25d5 100755
+index f89cb3b31..375d483f7 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
- # OpenZFS issue #7432
+ # ZoL issue #7432
 log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
 log_must touch /$TESTPOOL/$TESTFS2/attrs
 -log_must eval "python -c 'print \"a\" * 4096' | \
@@ -8,44 +8,47 @@ Originally-By: Antonio Russo <aerusso@aerusso.net>

 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
- man/Makefile.am                        | 2 +-
+ man/man1/Makefile.am                   | 2 +-
+ man/man8/Makefile.am                   | 1 +
 man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 3 files changed, 3 insertions(+), 2 deletions(-)
 rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)

-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8ab1b7572..8b3dbe633 100644
--- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -8,7 +8,6 @@ dist_man_MANS = \
- 	man1/ztest.1 \
- 	man1/raidz_test.1 \
- 	man1/zvol_wait.1 \
-	man1/arcstat.1 \
- 	\
- 	man5/vdev_id.conf.5 \
- 	\
-@@ -21,6 +20,7 @@ dist_man_MANS = \
- 	man7/zpoolconcepts.7 \
- 	man7/zpoolprops.7 \
- 	\
-+	man8/arcstat.8 \
- 	man8/fsck.zfs.8 \
- 	man8/mount.zfs.8 \
- 	man8/vdev_id.8 \
+diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
+index 8d7457a3e..101af7b6c 100644
+--- a/man/man1/Makefile.am
+++ b/man/man1/Makefile.am
+@@ -1,4 +1,4 @@
+-dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
+dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
+ EXTRA_DIST = cstyle.1
+ 
+ if BUILD_LINUX
+diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
+index 07f6aefa6..a757b1c62 100644
+--- a/man/man8/Makefile.am
+++ b/man/man8/Makefile.am
+@@ -1,6 +1,7 @@
+ include $(top_srcdir)/config/Substfiles.am
+ 
+ dist_man_MANS = \
+	arcstat.8 \
+ 	fsck.zfs.8 \
+ 	mount.zfs.8 \
+ 	vdev_id.8 \
 diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
 similarity index 99%
 rename from man/man1/arcstat.1
 rename to man/man8/arcstat.8
-index a69cd8937..dfe9c971b 100644
+index ca508b49c..0aa81849a 100644
 --- a/man/man1/arcstat.1
 +++ b/man/man8/arcstat.8
@@ -13,7 +13,7 @@
+ .\" Copyright (c) 2015 by Delphix. All rights reserved.
 .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
 .\"
- .Dd May 26, 2021
-.Dt ARCSTAT 1
-+.Dt ARCSTAT 8
- .Os
- .
- .Sh NAME
+-.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
+.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
+ .SH NAME
+ arcstat \- report ZFS ARC and L2ARC statistics
+ .SH SYNOPSIS
@@ -28,7 +28,6 @@ sbin/zstreamdump
 usr/bin/zvol_wait
 usr/lib/modules-load.d/ lib/
 usr/lib/zfs-linux/zpool.d/
-usr/lib/zfs-linux/zpool_influxdb
 usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
@@ -36,14 +35,7 @@ usr/share/bash-completion/completions
 usr/share/man/man8/arcstat.8
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
-usr/share/man/man4/zfs.4
-usr/share/man/man4/spl.4
 usr/share/man/man5/
-usr/share/man/man7/zfsconcepts.7
-usr/share/man/man7/zfsprops.7
-usr/share/man/man7/zpoolconcepts.7
-usr/share/man/man7/zpoolprops.7
-usr/share/man/man7/zpool-features.7
 usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
 usr/share/man/man8/vdev_id.8
@@ -87,6 +79,8 @@ usr/share/man/man8/zfs-userspace.8
 usr/share/man/man8/zfs-wait.8
 usr/share/man/man8/zfs.8
 usr/share/man/man8/zfs_ids_to_path.8
+usr/share/man/man8/zfsconcepts.8
+usr/share/man/man8/zfsprops.8
 usr/share/man/man8/zgenhostid.8
 usr/share/man/man8/zpool-add.8
 usr/share/man/man8/zpool-attach.8
@@ -100,7 +94,6 @@ usr/share/man/man8/zpool-export.8
 usr/share/man/man8/zpool-get.8
 usr/share/man/man8/zpool-history.8
 usr/share/man/man8/zpool-import.8
-usr/share/man/man8/zpool_influxdb.8
 usr/share/man/man8/zpool-initialize.8
 usr/share/man/man8/zpool-iostat.8
 usr/share/man/man8/zpool-labelclear.8
@@ -121,6 +114,7 @@ usr/share/man/man8/zpool-trim.8
 usr/share/man/man8/zpool-upgrade.8
 usr/share/man/man8/zpool-wait.8
 usr/share/man/man8/zpool.8
+usr/share/man/man8/zpoolconcepts.8
+usr/share/man/man8/zpoolprops.8
 usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
-usr/share/zfs/compatibility.d/