X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build-zfs.m4;h=f2f72ec7672ac3c95a717e4f1d51bb56174d5694;hb=561bd1db8620a3166100b95f25cf10f1b0211e70;hp=0cc1e621e73622284d44d51020cbf80a6f21ef7c;hpb=b2659030edb7d34c91430ff924bab23881b6c230;p=fs%2Flustre-release.git

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index 0cc1e62..f2f72ec 100644
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -147,8 +147,10 @@ AC_DEFUN([LB_SPL], [
 		AC_MSG_CHECKING([spl file name for module symbols])
 		AS_IF([test -r $splobj/$SYMVERFILE], [
 			splsym=$SYMVERFILE
+			EXTRA_SYMBOLS="$EXTRA_SYMBOLS $splobj/$SYMVERFILE"
 		], [test -r $splobj/module/$SYMVERFILE], [
 			splsym=$SYMVERFILE
+			EXTRA_SYMBOLS="$EXTRA_SYMBOLS $splobj/module/$SYMVERFILE"
 		], [
 			splsym="[Not found]"
 			enable_zfs=no
@@ -159,12 +161,11 @@ AC_DEFUN([LB_SPL], [
 	SPL=${splsrc}
 	SPL_OBJ=${splobj}
 	SPL_VERSION=${splver}
-	SPL_SYMBOLS=${splsym}
 
 	AC_SUBST(SPL)
 	AC_SUBST(SPL_OBJ)
 	AC_SUBST(SPL_VERSION)
-	AC_SUBST(SPL_SYMBOLS)
+	AC_SUBST(EXTRA_SYMBOLS)
 ])
 
 AC_DEFUN([LB_ZFS], [
@@ -253,8 +254,10 @@ AC_DEFUN([LB_ZFS], [
 		AC_MSG_CHECKING([zfs file name for module symbols])
 		AS_IF([test -r $zfsobj/$SYMVERFILE], [
 			zfssym=$SYMVERFILE
+			EXTRA_SYMBOLS="$EXTRA_SYMBOLS $zfsobj/$SYMVERFILE"
 		], [test -r $zfsobj/module/$SYMVERFILE], [
 			zfssym=$SYMVERFILE
+			EXTRA_SYMBOLS="$EXTRA_SYMBOLS $zfsobj/module/$SYMVERFILE"
 		], [
 			zfssym="[Not found]"
 			enable_zfs=no
@@ -265,12 +268,11 @@ AC_DEFUN([LB_ZFS], [
 	ZFS=${zfssrc}
 	ZFS_OBJ=${zfsobj}
 	ZFS_VERSION=${zfsver}
-	ZFS_SYMBOLS=${zfssym}
 
 	AC_SUBST(ZFS)
 	AC_SUBST(ZFS_OBJ)
 	AC_SUBST(ZFS_VERSION)
-	AC_SUBST(ZFS_SYMBOLS)
+	AC_SUBST(EXTRA_SYMBOLS)
 ])
 
 AC_DEFUN([LB_ZFS_DEVEL], [
@@ -283,7 +285,7 @@ AC_DEFUN([LB_ZFS_DEVEL], [
 	AS_IF([test ! -z "${zfsdevel}"], [
 		AS_IF([test -d "${zfsdevel}/usr/include/libspl" && test -d "${zfsdevel}/usr/include/libzfs"], [
 			zfsinc="-I $zfsdevel/usr/include/libspl -I $zfsdevel/usr/include/libzfs"
-			zfslib="-L$zfsdevel/lib64 -L$zfsdevel/lib"
+			zfslib="-L$zfsdevel/usr/lib64 -L$zfsdevel/usr/lib -L$zfsdevel/lib64 -L$zfsdevel/lib"
 		], [
 			AC_MSG_ERROR([Path to development headers directory does not exist])
 		])
@@ -401,6 +403,31 @@ your distribution.
 			AC_DEFINE(HAVE_DSL_SYNC_TASK_DO_NOWAIT, 1,
 				[Have dsl_sync_task_do_nowait in ZFS])
 		])
+		LB_CHECK_COMPILE([if zfs defines sa_spill_alloc],
+		sa_spill_alloc, [
+			#include <sys/kmem.h>
+			#include <sys/sa.h>
+		],[
+			void *ptr;
+
+			ptr = sa_spill_alloc(KM_SLEEP);
+			sa_spill_free(ptr);
+		],[
+			AC_DEFINE(HAVE_SA_SPILL_ALLOC, 1,
+				[Have sa_spill_alloc in ZFS])
+		])
+		LB_CHECK_COMPILE([if zfs defines spa_maxblocksize],
+		spa_maxblocksize, [
+			#include <sys/spa.h>
+		],[
+			spa_t *spa = NULL;
+			int size;
+
+			size = spa_maxblocksize(spa);
+		],[
+			AC_DEFINE(HAVE_SPA_MAXBLOCKSIZE, 1,
+				[Have spa_maxblocksize in ZFS])
+		])
 	])
 
 	AM_CONDITIONAL(ZFS_ENABLED, [test "x$enable_zfs" = xyes])