From c905fdbf58d4a856a4110e4aaab1b04384f2cd24 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 18 Jan 2022 00:21:15 -0800 Subject: [PATCH] LU-15222 build: Update ZFS version to 2.0.6 Update ZFS version to 2.0.6. The changes are listed in: https://github.com/openzfs/zfs/releases/tag/zfs-2.0.6 Lustre-change: https://review.whamcloud.com/45567 Lustre-commit: 8e6ef2d91b3acbec5ad1157404c263277a25cbb3 Change-Id: I2a7df45b79f402c3d3bce8b137edd11b5224b576 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/46160 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- contrib/lbuild/lbuild | 2 +- lustre/ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 54ab4d8..c772879 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1096,7 +1096,7 @@ build_spl_zfs() { # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the # destination for the rpms export RPM_BUILD_ROOT=$TOPDIR - SPLZFSVER=${SPLZFSVER:-2.0.0} + SPLZFSVER=${SPLZFSVER:-2.0.6} SPLZFSTAG=${SPLZFSTAG:-} # "spl zfs" prior to 0.8.0 # "zfs" for 0.8.0 and later diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 4284ab4..9a1fa4a 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -43,7 +43,7 @@ 5.4.0-37 (Ubuntu 20.04) 5.4.0 (vanilla kernel.org) * Recommended e2fsprogs version: 1.45.6.wc5 or newer - * Recommended ZFS version: 2.0.0 + * Recommended ZFS version: 2.0.6 * NFS export disabled when stack size < 8192 (32-bit Lustre clients), since the NFSv4 export of Lustre filesystem with 4K stack may cause a stack overflow. For more information, please refer to bugzilla 17630. -- 1.8.3.1