1 files changed, 19 insertions, 15 deletions
diff --git a/config/kernel-bio-end-io-t-args.m4 b/config/kernel-bio-end-io-t-args.m4
index 3c420cc0c..80a1fbeda 100644
--- a/config/kernel-bio-end-io-t-args.m4
+++ b/config/kernel-bio-end-io-t-args.m4
@@ -5,20 +5,21 @@ dnl # bio->bi_error. This also replaces bio->bi_flags value BIO_UPTODATE.
 dnl # Introduced by torvalds/linux@4246a0b63bd8f56a1469b12eafeb875b1041a451
 dnl # ("block: add a bi_error field to struct bio").
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [
-	AC_MSG_CHECKING([whether bio_end_io_t wants 1 arg])
-	ZFS_LINUX_TRY_COMPILE([
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_END_IO_T_ARGS], [
+	ZFS_LINUX_TEST_SRC([bio_end_io_t_args], [
 		#include <linux/bio.h>
-
 		void wanted_end_io(struct bio *bio) { return; }
-
 		bio_end_io_t *end_io __attribute__ ((unused)) = wanted_end_io;
-	],[
-	],[
+	], [])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [
+	AC_MSG_CHECKING([whether bio_end_io_t wants 1 arg])
+	ZFS_LINUX_TEST_RESULT([bio_end_io_t_args], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_1ARG_BIO_END_IO_T, 1,
-			  [bio_end_io_t wants 1 arg])
-	],[
+		    [bio_end_io_t wants 1 arg])
+	], [
 		AC_MSG_RESULT(no)
 	])
 ])
@@ -28,16 +29,19 @@ dnl # 4.13 API change
 dnl # The bio->bi_error field was replaced with bio->bi_status which is an
 dnl # enum which describes all possible error types.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BIO_BI_STATUS], [
-	AC_MSG_CHECKING([whether bio->bi_status exists])
-	ZFS_LINUX_TRY_COMPILE([
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_BI_STATUS], [
+	ZFS_LINUX_TEST_SRC([bio_bi_status], [
 		#include <linux/bio.h>
-	],[
+	], [
 		struct bio bio __attribute__ ((unused));
 		blk_status_t status __attribute__ ((unused)) = BLK_STS_OK;
-
 		bio.bi_status = status;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_BI_STATUS], [
+	AC_MSG_CHECKING([whether bio->bi_status exists])
+	ZFS_LINUX_TEST_RESULT([bio_bi_status], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BIO_BI_STATUS, 1, [bio->bi_status exists])
 	],[