X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fkernel-bio-failfast.m4;h=6b9a5269eea12109ab0e3f9aa0ef995cc2b908d6;hb=f9e459d1435832caa69fdaf236ebaeacd93f1b3e;hp=acc6575629dd36608d7cdac70f3f1e79b6c79e5a;hpb=2959d94a0a53612cc1ca9ce9d17df26c3d69a513;p=zfs.git

diff --git a/config/kernel-bio-failfast.m4 b/config/kernel-bio-failfast.m4
index acc6575..6b9a526 100644
--- a/config/kernel-bio-failfast.m4
+++ b/config/kernel-bio-failfast.m4
@@ -1,22 +1,55 @@
 dnl #
-dnl # 2.6.28 API change
-dnl # Device, transport, and driver FAILFAST flags were added and
-dnl # the now legacy BIO_RW_FAILFAST flag was removed.
+dnl # Preferred interface for setting FAILFAST on a bio:
+dnl #   2.6.12-2.6.27: BIO_RW_FAILFAST
+dnl #   2.6.28-2.6.35: BIO_RW_FAILFAST_{DEV|TRANSPORT|DRIVER}
+dnl #   2.6.36-2.6.xx: REQ_FAILFAST_{DEV|TRANSPORT|DRIVER}
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_BIO_FAILFAST], [
+	AC_MSG_CHECKING([whether BIO_RW_FAILFAST is defined])
+	ZFS_LINUX_TRY_COMPILE([
+		#include <linux/bio.h>
+	],[
+		int flags __attribute__ ((unused));
+		flags = (1 << BIO_RW_FAILFAST);
+	],[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_BIO_RW_FAILFAST, 1,
+		          [BIO_RW_FAILFAST is defined])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_FAILFAST_DTD], [
 	AC_MSG_CHECKING([whether BIO_RW_FAILFAST_* are defined])
 	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/bio.h>
 	],[
-		int flags;
+		int flags __attribute__ ((unused));
 		flags = ((1 << BIO_RW_FAILFAST_DEV) |
 			 (1 << BIO_RW_FAILFAST_TRANSPORT) |
 			 (1 << BIO_RW_FAILFAST_DRIVER));
 	],[
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BIO_RW_FAILFAST, 1,
+		AC_DEFINE(HAVE_BIO_RW_FAILFAST_DTD, 1,
 		          [BIO_RW_FAILFAST_* are defined])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
+
+AC_DEFUN([ZFS_AC_KERNEL_REQ_FAILFAST_MASK], [
+	AC_MSG_CHECKING([whether REQ_FAILFAST_MASK is defined])
+	ZFS_LINUX_TRY_COMPILE([
+		#include <linux/bio.h>
+	],[
+		int flags __attribute__ ((unused));
+		flags = REQ_FAILFAST_MASK;
+	],[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_BIO_REQ_FAILFAST_MASK, 1,
+		          [REQ_FAILFAST_MASK is defined])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])