X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Flustre-build-zfs.m4;h=ff7f1150edd8fa0c93a460f940d185e5c1cdba86;hb=b29b9fb4fd69928331d7374ec85b0b8fc3642a50;hp=3aa9314ab59b68b26323c3131edbbb4a0cce6186;hpb=9765c6174ef580fb4deef4e7faea6d5ed634b00f;p=fs%2Flustre-release.git

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index 3aa9314..ff7f115 100644
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -450,6 +450,7 @@ your distribution.
 			AC_DEFINE(HAVE_SPA_MAXBLOCKSIZE, 1,
 				[Have spa_maxblocksize in ZFS])
 		])
+
 		dnl #
 		dnl # ZFS 0.7.x adds support for large dnodes.  This
 		dnl # allows Lustre to optionally specify the size of a
@@ -479,6 +480,29 @@ your distribution.
 			AC_DEFINE(HAVE_DMU_OBJECT_ALLOC_DNSIZE, 1,
 				[Have dmu_object_alloc_dnsize in ZFS])
 		])
+
+		dnl #
+		dnl # ZFS 0.7.x extended dmu_prefetch() to take an additional
+		dnl # 'level' and 'priority' argument.  Use a level of 0 and a
+		dnl # priority of ZIO_PRIORITY_SYNC_READ to replicate the
+		dnl # behavior of the four argument version.
+		dnl #
+		LB_CHECK_COMPILE([if ZFS has 'dmu_prefetch' with 6 args],
+		dmu_prefetch, [
+			#include <sys/dmu.h>
+		],[
+			objset_t *os = NULL;
+			uint64_t object = 0;
+			int64_t level = 0;
+			uint64_t offset = 0;
+			uint64_t len = 0;
+			enum zio_priority pri = ZIO_PRIORITY_SYNC_READ;
+
+			dmu_prefetch(os, object, level, offset, len, pri);
+		],[
+			AC_DEFINE(HAVE_DMU_PREFETCH_6ARG, 1,
+				[Have 6 argument dmu_pretch in ZFS])
+		])
 	])
 
 	AM_CONDITIONAL(ZFS_ENABLED, [test "x$enable_zfs" = xyes])