X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-zfs.m4;fp=config%2Flustre-build-zfs.m4;h=9e39c80b76184601dc5ae776c600df76602da328;hp=b92d17fbd19a08727867b73ff62ec9c732f60295;hb=0fedb017c12629d145fa0577451d43adc757eb36;hpb=e25c0f1a8595d65f62945de11dc2cf80409a5cc8

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index b92d17f..9e39c80 100644
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -628,6 +628,33 @@ your distribution.
 			AC_DEFINE(HAVE_DMU_READ_BY_DNODE, 1,
 				[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])
+		])
 	])
 
 	AM_CONDITIONAL(ZFS_ENABLED, [test "x$enable_zfs" = xyes])