From 4813eee9b06f6ceb4f39cce42d904ec1516a824a Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Wed, 16 May 2018 16:00:29 +0800 Subject: [PATCH] LU-11024 osd-zfs: properly detect ZFS dnode accounting Properly detect if native ZFS dnode accounting is available for ZFS 0.7.x releases that do not contain ZFS project quota. The function signature changed after ZFS Project Quota was landed, but we still need to check for the old function for 0.7.x. Signed-off-by: Andreas Dilger Signed-off-by: Fan Yong Change-Id: Icd40e0bdaa0b7738e9aa761836167780843ebbe5 Reviewed-on: https://review.whamcloud.com/32418 Tested-by: Jenkins Reviewed-by: Jinshan Xiong Tested-by: Maloo --- config/lustre-build-zfs.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4 index 6debc60..0bcdf20 100644 --- a/config/lustre-build-zfs.m4 +++ b/config/lustre-build-zfs.m4 @@ -522,11 +522,11 @@ your distribution. dnl # dnl # ZFS 0.7.0 feature: SPA_FEATURE_USEROBJ_ACCOUNTING dnl # - LB_CHECK_COMPILE([if zfs has native dnode accounting supported], - dmu_objset_id_quota_upgrade, [ + LB_CHECK_COMPILE([if ZFS has native dnode accounting supported], + dmu_objset_userobjused_enabled, [ #include ],[ - dmu_objset_id_quota_upgrade(NULL); + dmu_objset_userobjused_enabled(NULL); ],[ AC_DEFINE(HAVE_DMU_USEROBJ_ACCOUNTING, 1, [Have native dnode accounting in ZFS]) -- 1.8.3.1