From 200706688f1ce3aff59f41dfd1461e43ffafc667 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 26 Jul 2022 16:37:25 -0700 Subject: [PATCH] LU-16048 build: Update ZFS version to 2.1.5 Update ZFS version to 2.1.5. The changes are listed in: https://github.com/openzfs/zfs/releases/tag/zfs-2.1.5 Change-Id: I9f25aafe889f87fb80677e59dbe4679932d8b920 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/48046 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Nathaniel Clark Reviewed-by: Oleg Drokin --- 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 a95914b..a71d5bb 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1023,7 +1023,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.1.2} + SPLZFSVER=${SPLZFSVER:-2.1.5} 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 4f2d1bc..3c96550 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -122,7 +122,7 @@ TBD Whamcloud 5.11.0-31 (Ubuntu 20.04.3 HWE) 5.11.0 (vanilla kernel.org) * Recommended e2fsprogs version: 1.46.2.wc5 or newer - * Recommended ZFS version: 2.1.2 + * Recommended ZFS version: 2.1.5 * 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