diff --git a/config/kernel-bio-failfast.m4 b/config/kernel-bio-failfast.m4
index 6b9a5269e..cfbec0523 100644
--- a/config/kernel-bio-failfast.m4
+++ b/config/kernel-bio-failfast.m4
@@ -1,24 +1,8 @@
 dnl #
 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 #       >= 2.6.36: 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])
@@ -47,7 +31,7 @@ AC_DEFUN([ZFS_AC_KERNEL_REQ_FAILFAST_MASK], [
 		flags = REQ_FAILFAST_MASK;
 	],[
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BIO_REQ_FAILFAST_MASK, 1,
+		AC_DEFINE(HAVE_REQ_FAILFAST_MASK, 1,
 		          [REQ_FAILFAST_MASK is defined])
 	],[
 		AC_MSG_RESULT(no)
diff --git a/config/kernel.m4 b/config/kernel.m4
index ce10707e4..69470e128 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -19,7 +19,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE
 	ZFS_AC_KERNEL_BDEV_PHYSICAL_BLOCK_SIZE
 	ZFS_AC_KERNEL_BIO_BVEC_ITER
-	ZFS_AC_KERNEL_BIO_FAILFAST
 	ZFS_AC_KERNEL_BIO_FAILFAST_DTD
 	ZFS_AC_KERNEL_REQ_FAILFAST_MASK
 	ZFS_AC_KERNEL_BIO_END_IO_T_ARGS
diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h
index 8566033fc..89e888c30 100644
--- a/include/linux/blkdev_compat.h
+++ b/include/linux/blkdev_compat.h
@@ -347,26 +347,21 @@ bio_set_flags_failfast(struct block_device *bdev, int *flags)
 #endif /* BLOCK_EXT_MAJOR */
 #endif /* CONFIG_BUG */
 
-#ifdef HAVE_BIO_RW_FAILFAST_DTD
+#if defined(HAVE_BIO_RW_FAILFAST_DTD)
 	/* BIO_RW_FAILFAST_* preferred interface from 2.6.28 - 2.6.35 */
 	*flags |= (
 	    (1 << BIO_RW_FAILFAST_DEV) |
 	    (1 << BIO_RW_FAILFAST_TRANSPORT) |
 	    (1 << BIO_RW_FAILFAST_DRIVER));
-#else
-#ifdef HAVE_BIO_RW_FAILFAST
-	/* BIO_RW_FAILFAST preferred interface from 2.6.12 - 2.6.27 */
-	*flags |= (1 << BIO_RW_FAILFAST);
-#else
-#ifdef HAVE_REQ_FAILFAST_MASK
+#elif defined(HAVE_REQ_FAILFAST_MASK)
 	/*
 	 * REQ_FAILFAST_* preferred interface from 2.6.36 - 2.6.xx,
 	 * the BIO_* and REQ_* flags were unified under REQ_* flags.
 	 */
 	*flags |= REQ_FAILFAST_MASK;
-#endif /* HAVE_REQ_FAILFAST_MASK */
-#endif /* HAVE_BIO_RW_FAILFAST */
-#endif /* HAVE_BIO_RW_FAILFAST_DTD */
+#else
+#error "Undefined block IO FAILFAST interface."
+#endif
 }
 
 /*