LU-11845 zfs: put configure checks in version order

Put the ZFS feature checks in release version order, so that it is
easier to track when they apply and when they can be removed in
the future.

Make the configure checks use decrypt=B_TRUE just to illustrate
more correct usage.

Lustre-change: https://review.whamcloud.com/34000
Lustre-commit: 55c973ba5cb595d51b4990eea9ad6803e7c0645e

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I22053638d72b41b51b6f56dea5668e78535cab07
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/35475
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index dd59485..54d788f 100644 (file)
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -644,33 +644,6 @@ your distribution.
                                [Have dmu_read_by_dnode() in ZFS])
                ])
                dnl #
-               dnl # ZFS 0.8.x changes dmu_objset_own for encryption
-               dnl #
-               LB_CHECK_COMPILE([if ZFS has 'dmu_objset_own' with 6 args],
-               dmu_objset_own, [
-                       #include <sys/dmu_objset.h>
-               ],[
-                       objset_t *os = NULL;
-                       dmu_objset_type_t type = DMU_OST_ANY;
-                       dmu_objset_own(NULL, type, B_FALSE, B_FALSE, FTAG, &os);
-               ],[
-                       AC_DEFINE(HAVE_DMU_OBJSET_OWN_6ARG, 1,
-                               [Have dmu_objset_own() with 6 args])
-               ])
-               dnl #
-               dnl # ZFS 0.8.x changes dmu_objset_disown for encryption
-               dnl #
-               LB_CHECK_COMPILE([if ZFS has 'dmu_objset_disown' with 3 args],
-               dmu_objset_disown, [
-                       #include <sys/dmu_objset.h>
-               ],[
-                       objset_t *os = NULL;
-                       dmu_objset_disown(os, B_FALSE, FTAG);
-               ],[
-                       AC_DEFINE(HAVE_DMU_OBJSET_DISOWN_3ARG, 1,
-                               [Have dmu_objset_disown() with 3 args])
-               ])
-               dnl #
                dnl # ZFS 0.7.2 adds new method dmu_tx_mark_netfree
                dnl #
                LB_CHECK_COMPILE([if ZFS has 'dmu_tx_mark_netfree'],
@@ -708,6 +681,33 @@ your distribution.
                        AC_DEFINE(HAVE_ZFS_REFCOUNT_ADD, 1,
                                [Have zfs_refcount_add])
                ])
+               dnl #
+               dnl # ZFS 0.8.x changes dmu_objset_own for encryption
+               dnl #
+               LB_CHECK_COMPILE([if ZFS has 'dmu_objset_own' with 6 args],
+               dmu_objset_own, [
+                       #include <sys/dmu_objset.h>
+               ],[
+                       objset_t *os = NULL;
+                       dmu_objset_type_t type = DMU_OST_ANY;
+                       dmu_objset_own(NULL, type, B_FALSE, B_TRUE, FTAG, &os);
+               ],[
+                       AC_DEFINE(HAVE_DMU_OBJSET_OWN_6ARG, 1,
+                               [Have dmu_objset_own() with 6 args])
+               ])
+               dnl #
+               dnl # ZFS 0.8.x changes dmu_objset_disown for encryption
+               dnl #
+               LB_CHECK_COMPILE([if ZFS has 'dmu_objset_disown' with 3 args],
+               dmu_objset_disown, [
+                       #include <sys/dmu_objset.h>
+               ],[
+                       objset_t *os = NULL;
+                       dmu_objset_disown(os, B_TRUE, FTAG);
+               ],[
+                       AC_DEFINE(HAVE_DMU_OBJSET_DISOWN_3ARG, 1,
+                               [Have dmu_objset_disown() with 3 args])
+               ])
        ])
 
        AS_IF([test "x$enable_zfs" = xyes], [