Perform KABI checks in parallel

Reduce the time required for ./configure to perform the needed
KABI checks by allowing kbuild to compile multiple test cases in
parallel.  This was accomplished by splitting each test's source
code from the logic handling whether that code could be compiled
or not.

By introducing this split it's possible to minimize the number of
times kbuild needs to be invoked.  As importantly, it means all of
the tests can be built in parallel.  This does require a little extra
care since we expect some tests to fail, so the --keep-going (-k)
option must be provided otherwise some tests may not get compiled.
Furthermore, since a failure during the kbuild modpost phase will
result in an early exit; the final linking phase is limited to tests
which passed the initial compilation and produced an object file.

Once everything has been built the configure script proceeds as
previously.  The only significant difference is that it now merely
needs to test for the existence of a .ko file to determine the
result of a given test.  This vastly speeds up the entire process.

New test cases should use ZFS_LINUX_TEST_SRC to declare their test
source code and ZFS_LINUX_TEST_RESULT to check the result.  All of
the existing kernel-*.m4 files have been updated accordingly, see
config/kernel-current-time.m4 for a basic example.  The legacy
ZFS_LINUX_TRY_COMPILE macro has been kept to handle special cases
but it's use is not encouraged.

                  master (secs)   patched (secs)
                  -------------   ----------------
autogen.sh        61              68
configure         137             24  (~17% of current run time)
make -j $(nproc)  44              44
make rpms         287             150

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8547
Closes #9132
Closes #9341
Conflicts:
	Makefile.am
	config/kernel-fpu.m4

.gitignore

@@ -36,6 +36,7 @@ Makefile.in
 # Top level generated files specific to this top level dir
 #
 /bin
+/build
 /configure
 /config.log
 /config.status

Makefile.am

@@ -44,8 +44,9 @@ gitrev:
 
 BUILT_SOURCES = gitrev
 
-distclean-local:
+# Double-colon rules are allowed; there are multiple independent definitions.
-	-$(RM) -R autom4te*.cache
+distclean-local::
+	-$(RM) -R autom4te*.cache build
 	-find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
 		-o -name .pc -o -name .hg -o -name .git \) -prune -o \
 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
@@ -92,8 +93,8 @@ commitcheck:
 	fi
 
 cstyle:
-	@find ${top_srcdir} -name '*.[hc]' ! -name 'zfs_config.*' \
+	@find ${top_srcdir} -name build -prune -o -name '*.[hc]' \
-		! -name '*.mod.c' -type f \
+		! -name 'zfs_config.*' ! -name '*.mod.c' -type f \
 		-exec ${top_srcdir}/scripts/cstyle.pl -cpP {} \+
 
 shellcheck:

config/iconv.m4

@@ -269,8 +269,7 @@ size_t iconv();
         [am_cv_proto_iconv_arg1="const"])
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([
+    AC_MSG_RESULT([$am_cv_proto_iconv])
-         $am_cv_proto_iconv])
   else
     dnl When compiling GNU libiconv on a system that does not have iconv yet,
     dnl pick the POSIX compliant declaration without 'const'.

config/kernel-access-ok-type.m4

@@ -4,17 +4,23 @@ dnl #
 dnl # - access_ok(type, addr, size)
 dnl # + access_ok(addr, size)
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_ACCESS_OK_TYPE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_ACCESS_OK_TYPE], [
-	AC_MSG_CHECKING([whether access_ok() has 'type' parameter])
+	ZFS_LINUX_TEST_SRC([access_ok_type], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/uaccess.h>
 	],[
-		const void __user __attribute__((unused)) *addr = (void *) 0xdeadbeef;
+		const void __user __attribute__((unused)) *addr =
+		    (void *) 0xdeadbeef;
 		unsigned long __attribute__((unused)) size = 1;
 		int error __attribute__((unused)) = access_ok(0, addr, size);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_ACCESS_OK_TYPE], [
+	AC_MSG_CHECKING([whether access_ok() has 'type' parameter])
+	ZFS_LINUX_TEST_RESULT([access_ok_type], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_ACCESS_OK_TYPE, 1, [kernel has access_ok with 'type' parameter])
+		AC_DEFINE(HAVE_ACCESS_OK_TYPE, 1,
+		    [kernel has access_ok with 'type' parameter])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-acl.m4

@@ -3,32 +3,26 @@ dnl # Check if posix_acl_release can be used from a ZFS_META_LICENSED
 dnl # module.  The is_owner_or_cap macro was replaced by
 dnl # inode_owner_or_capable
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_RELEASE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_POSIX_ACL_RELEASE], [
-	AC_MSG_CHECKING([whether posix_acl_release() is available])
+	ZFS_LINUX_TEST_SRC([posix_acl_release], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/cred.h>
 		#include <linux/fs.h>
 		#include <linux/posix_acl.h>
-	],[
+	], [
-		struct posix_acl* tmp = posix_acl_alloc(1, 0);
+		struct posix_acl *tmp = posix_acl_alloc(1, 0);
 		posix_acl_release(tmp);
-	],[
+	], [], [$ZFS_META_LICENSE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_RELEASE], [
+	AC_MSG_CHECKING([whether posix_acl_release() is available])
+	ZFS_LINUX_TEST_RESULT([posix_acl_release], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_POSIX_ACL_RELEASE, 1,
 		    [posix_acl_release() is available])
 
 		AC_MSG_CHECKING([whether posix_acl_release() is GPL-only])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([posix_acl_release_license], [
-			#include <linux/module.h>
-			#include <linux/cred.h>
-			#include <linux/fs.h>
-			#include <linux/posix_acl.h>
-
-			MODULE_LICENSE("$ZFS_META_LICENSE");
-		],[
-			struct posix_acl* tmp = posix_acl_alloc(1, 0);
-			posix_acl_release(tmp);
-		],[
 			AC_MSG_RESULT(no)
 		],[
 			AC_MSG_RESULT(yes)
@@ -46,24 +40,25 @@ dnl # set_cached_acl() and forget_cached_acl() changed from inline to
 dnl # EXPORT_SYMBOL. In the former case, they may not be usable because of
 dnl # posix_acl_release. In the latter case, we can always use them.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SET_CACHED_ACL_USABLE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SET_CACHED_ACL_USABLE], [
-	AC_MSG_CHECKING([whether set_cached_acl() is usable])
+	ZFS_LINUX_TEST_SRC([set_cached_acl], [
-	ZFS_LINUX_TRY_COMPILE([
-		#include <linux/module.h>
 		#include <linux/cred.h>
 		#include <linux/fs.h>
 		#include <linux/posix_acl.h>
-
+	], [
-		MODULE_LICENSE("$ZFS_META_LICENSE");
-	],[
 		struct inode *ip = NULL;
 		struct posix_acl *acl = posix_acl_alloc(1, 0);
 		set_cached_acl(ip, ACL_TYPE_ACCESS, acl);
 		forget_cached_acl(ip, ACL_TYPE_ACCESS);
-	],[
+	], [], [$ZFS_META_LICENSE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SET_CACHED_ACL_USABLE], [
+	AC_MSG_CHECKING([whether set_cached_acl() is usable])
+	ZFS_LINUX_TEST_RESULT([set_cached_acl_license], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SET_CACHED_ACL_USABLE, 1,
-		    [posix_acl_release() is usable])
+		    [set_cached_acl() is usable])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -77,14 +72,25 @@ dnl #
 dnl # 3.14 API change,
 dnl # posix_acl_chmod() is changed to __posix_acl_chmod()
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_CHMOD], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_POSIX_ACL_CHMOD], [
-	AC_MSG_CHECKING([whether posix_acl_chmod exists])
+	ZFS_LINUX_TEST_SRC([posix_acl_chmod], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		#include <linux/posix_acl.h>
 	],[
 		posix_acl_chmod(NULL, 0, 0)
+	])
+
+	ZFS_LINUX_TEST_SRC([__posix_acl_chmod], [
+		#include <linux/fs.h>
+		#include <linux/posix_acl.h>
 	],[
+		__posix_acl_chmod(NULL, 0, 0)
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_CHMOD], [
+	AC_MSG_CHECKING([whether posix_acl_chmod exists])
+	ZFS_LINUX_TEST_RESULT([posix_acl_chmod], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_POSIX_ACL_CHMOD, 1, [posix_acl_chmod() exists])
 	],[
@@ -92,14 +98,10 @@ AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_CHMOD], [
 	])
 
 	AC_MSG_CHECKING([whether __posix_acl_chmod exists])
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([__posix_acl_chmod], [
-		#include <linux/fs.h>
-		#include <linux/posix_acl.h>
-	],[
-		__posix_acl_chmod(NULL, 0, 0)
-	],[
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE___POSIX_ACL_CHMOD, 1, [__posix_acl_chmod() exists])
+		AC_DEFINE(HAVE___POSIX_ACL_CHMOD, 1,
+		    [__posix_acl_chmod() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -109,18 +111,22 @@ dnl #
 dnl # 3.1 API change,
 dnl # posix_acl_equiv_mode now wants an umode_t* instead of a mode_t*
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T], [
-	AC_MSG_CHECKING([whether posix_acl_equiv_mode() wants umode_t])
+	ZFS_LINUX_TEST_SRC([posix_acl_equiv_mode], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		#include <linux/posix_acl.h>
 	],[
 		umode_t tmp;
 		posix_acl_equiv_mode(NULL,&tmp);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T], [
+	AC_MSG_CHECKING([whether posix_acl_equiv_mode() wants umode_t])
+	ZFS_LINUX_TEST_RESULT([posix_acl_equiv_mode], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T, 1,
-		    [ posix_acl_equiv_mode wants umode_t*])
+		    [posix_acl_equiv_mode wants umode_t*])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -130,9 +136,8 @@ dnl #
 dnl # 4.8 API change,
 dnl # The function posix_acl_valid now must be passed a namespace.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_POSIX_ACL_VALID_WITH_NS], [
-	AC_MSG_CHECKING([whether posix_acl_valid() wants user namespace])
+	ZFS_LINUX_TEST_SRC([posix_acl_valid_with_ns], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		#include <linux/posix_acl.h>
 	],[
@@ -141,7 +146,12 @@ AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS], [
 		int error;
 
 		error = posix_acl_valid(user_ns, acl);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS], [
+	AC_MSG_CHECKING([whether posix_acl_valid() wants user namespace])
+	ZFS_LINUX_TEST_RESULT([posix_acl_valid_with_ns], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_POSIX_ACL_VALID_WITH_NS, 1,
 		    [posix_acl_valid() wants user namespace])
@@ -155,9 +165,8 @@ dnl # 2.6.27 API change,
 dnl # Check if inode_operations contains the function permission
 dnl # and expects the nameidata structure to have been removed.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_PERMISSION], [
-	AC_MSG_CHECKING([whether iops->permission() exists])
+	ZFS_LINUX_TEST_SRC([inode_operations_permission], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int permission_fn(struct inode *inode, int mask) { return 0; }
@@ -166,8 +175,12 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION], [
 		    iops __attribute__ ((unused)) = {
 			.permission = permission_fn,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION], [
+	AC_MSG_CHECKING([whether iops->permission() exists])
+	ZFS_LINUX_TEST_RESULT([inode_operations_permission], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_PERMISSION, 1, [iops->permission() exists])
 	],[
@@ -180,9 +193,8 @@ dnl # 2.6.26 API change,
 dnl # Check if inode_operations contains the function permission
 dnl # and expects the nameidata structure to be passed.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA], [
-	AC_MSG_CHECKING([whether iops->permission() wants nameidata])
+	ZFS_LINUX_TEST_SRC([inode_operations_permission_with_nameidata], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		#include <linux/sched.h>
 
@@ -193,8 +205,12 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA], [
 		    iops __attribute__ ((unused)) = {
 			.permission = permission_fn,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA], [
+	AC_MSG_CHECKING([whether iops->permission() wants nameidata])
+	ZFS_LINUX_TEST_RESULT([inode_operations_permission_with_nameidata], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_PERMISSION, 1, [iops->permission() exists])
 		AC_DEFINE(HAVE_PERMISSION_WITH_NAMEIDATA, 1,
@@ -208,9 +224,8 @@ dnl #
 dnl # 2.6.32 API change,
 dnl # Check if inode_operations contains the function check_acl
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_CHECK_ACL], [
-	AC_MSG_CHECKING([whether iops->check_acl() exists])
+	ZFS_LINUX_TEST_SRC([inode_operations_check_acl], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int check_acl_fn(struct inode *inode, int mask) { return 0; }
@@ -219,8 +234,12 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL], [
 		    iops __attribute__ ((unused)) = {
 			.check_acl = check_acl_fn,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL], [
+	AC_MSG_CHECKING([whether iops->check_acl() exists])
+	ZFS_LINUX_TEST_RESULT([inode_operations_check_acl], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_CHECK_ACL, 1, [iops->check_acl() exists])
 	],[
@@ -232,9 +251,8 @@ dnl #
 dnl # 2.6.38 API change,
 dnl # The function check_acl gained a new parameter: flags
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL_WITH_FLAGS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_CHECK_ACL_WITH_FLAGS], [
-	AC_MSG_CHECKING([whether iops->check_acl() wants flags])
+	ZFS_LINUX_TEST_SRC([inode_operations_check_acl_with_flags], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int check_acl_fn(struct inode *inode, int mask,
@@ -244,8 +262,12 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL_WITH_FLAGS], [
 		    iops __attribute__ ((unused)) = {
 			.check_acl = check_acl_fn,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL_WITH_FLAGS], [
+	AC_MSG_CHECKING([whether iops->check_acl() wants flags])
+	ZFS_LINUX_TEST_RESULT([inode_operations_check_acl_with_flags], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_CHECK_ACL, 1, [iops->check_acl() exists])
 		AC_DEFINE(HAVE_CHECK_ACL_WITH_FLAGS, 1,
@@ -259,9 +281,8 @@ dnl #
 dnl # 3.1 API change,
 dnl # Check if inode_operations contains the function get_acl
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_GET_ACL], [
-	AC_MSG_CHECKING([whether iops->get_acl() exists])
+	ZFS_LINUX_TEST_SRC([inode_operations_get_acl], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		struct posix_acl *get_acl_fn(struct inode *inode, int type)
@@ -271,8 +292,12 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL], [
 		    iops __attribute__ ((unused)) = {
 			.get_acl = get_acl_fn,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL], [
+	AC_MSG_CHECKING([whether iops->get_acl() exists])
+	ZFS_LINUX_TEST_RESULT([inode_operations_get_acl], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_GET_ACL, 1, [iops->get_acl() exists])
 	],[
@@ -284,20 +309,23 @@ dnl #
 dnl # 3.14 API change,
 dnl # Check if inode_operations contains the function set_acl
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [
-	AC_MSG_CHECKING([whether iops->set_acl() exists])
+	ZFS_LINUX_TEST_SRC([inode_operations_set_acl], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
-		int set_acl_fn(struct inode *inode, struct posix_acl *acl, int type)
+		int set_acl_fn(struct inode *inode, struct posix_acl *acl,
-		    { return 0; }
+		    int type) { return 0; }
 
 		static const struct inode_operations
 		    iops __attribute__ ((unused)) = {
 			.set_acl = set_acl_fn,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL], [
+	AC_MSG_CHECKING([whether iops->set_acl() exists])
+	ZFS_LINUX_TEST_RESULT([inode_operations_set_acl], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SET_ACL, 1, [iops->set_acl() exists])
 	],[
@@ -311,16 +339,79 @@ dnl # The kernel get_acl will now check cache before calling i_op->get_acl and
 dnl # do set_cached_acl after that, so i_op->get_acl don't need to do that
 dnl # anymore.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GET_ACL_HANDLE_CACHE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_ACL_HANDLE_CACHE], [
-	AC_MSG_CHECKING([whether uncached_acl_sentinel() exists])
+	ZFS_LINUX_TEST_SRC([get_acl_handle_cache], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
-		void *sentinel __attribute__ ((unused)) = uncached_acl_sentinel(NULL);
+		void *sentinel __attribute__ ((unused)) =
-	],[
+		    uncached_acl_sentinel(NULL);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_GET_ACL_HANDLE_CACHE], [
+	AC_MSG_CHECKING([whether uncached_acl_sentinel() exists])
+	ZFS_LINUX_TEST_RESULT([get_acl_handle_cache], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_KERNEL_GET_ACL_HANDLE_CACHE, 1, [uncached_acl_sentinel() exists])
+		AC_DEFINE(HAVE_KERNEL_GET_ACL_HANDLE_CACHE, 1,
+		    [uncached_acl_sentinel() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
+
+dnl #
+dnl # 4.16 kernel: check if struct posix_acl acl.a_refcount is a refcount_t.
+dnl # It's an atomic_t on older kernels.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_ACL_HAS_REFCOUNT], [
+	ZFS_LINUX_TEST_SRC([acl_refcount], [
+		#include <linux/backing-dev.h>
+		#include <linux/refcount.h>
+		#include <linux/posix_acl.h>
+	],[
+		struct posix_acl acl;
+		refcount_t *r __attribute__ ((unused)) = &acl.a_refcount;
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_ACL_HAS_REFCOUNT], [
+	AC_MSG_CHECKING([whether posix_acl has refcount_t])
+	ZFS_LINUX_TEST_RESULT([acl_refcount], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_ACL_REFCOUNT, 1, [posix_acl has refcount_t])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_ACL], [
+	ZFS_AC_KERNEL_SRC_POSIX_ACL_RELEASE
+	ZFS_AC_KERNEL_SRC_SET_CACHED_ACL_USABLE
+	ZFS_AC_KERNEL_SRC_POSIX_ACL_CHMOD
+	ZFS_AC_KERNEL_SRC_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T
+	ZFS_AC_KERNEL_SRC_POSIX_ACL_VALID_WITH_NS
+	ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_PERMISSION
+	ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA
+	ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_CHECK_ACL
+	ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_CHECK_ACL_WITH_FLAGS
+	ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_GET_ACL
+	ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL
+	ZFS_AC_KERNEL_SRC_GET_ACL_HANDLE_CACHE
+	ZFS_AC_KERNEL_SRC_ACL_HAS_REFCOUNT
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_ACL], [
+	ZFS_AC_KERNEL_POSIX_ACL_RELEASE
+	ZFS_AC_KERNEL_SET_CACHED_ACL_USABLE
+	ZFS_AC_KERNEL_POSIX_ACL_CHMOD
+	ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T
+	ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS
+	ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION
+	ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA
+	ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL
+	ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL_WITH_FLAGS
+	ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL
+	ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL
+	ZFS_AC_KERNEL_GET_ACL_HANDLE_CACHE
+	ZFS_AC_KERNEL_ACL_HAS_REFCOUNT
+])

config/kernel-aio-fsync.m4

@@ -1,21 +1,23 @@
 dnl #
 dnl # Linux 4.9-rc5+ ABI, removal of the .aio_fsync field
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_AIO_FSYNC], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_AIO_FSYNC], [
-	AC_MSG_CHECKING([whether fops->aio_fsync() exists])
+	ZFS_LINUX_TEST_SRC([aio_fsync], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		static const struct file_operations
 		    fops __attribute__ ((unused)) = {
 			.aio_fsync = NULL,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_AIO_FSYNC], [
+	AC_MSG_CHECKING([whether fops->aio_fsync() exists])
+	ZFS_LINUX_TEST_RESULT([aio_fsync], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_FILE_AIO_FSYNC, 1, [fops->aio_fsync() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
-

config/kernel-automount.m4

@@ -5,16 +5,19 @@ dnl # solution to handling automounts.  Prior to this cifs/nfs clients
 dnl # which required automount support would abuse the follow_link()
 dnl # operation on directories for this purpose.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_AUTOMOUNT], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_AUTOMOUNT], [
-	AC_MSG_CHECKING([whether dops->d_automount() exists])
+	ZFS_LINUX_TEST_SRC([dentry_operations_d_automount], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/dcache.h>
 		struct vfsmount *d_automount(struct path *p) { return NULL; }
 		struct dentry_operations dops __attribute__ ((unused)) = {
 			.d_automount = d_automount,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_AUTOMOUNT], [
+	AC_MSG_CHECKING([whether dops->d_automount() exists])
+	ZFS_LINUX_TEST_RESULT([dentry_operations_d_automount], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_AUTOMOUNT, 1, [dops->automount() exists])
 	],[

config/kernel-bdev-logical-size.m4

@@ -5,21 +5,22 @@ dnl # it has been true for a while that there was no strict 1:1 mapping
 dnl # between physical sector size and logical block size this change makes
 dnl # it explicit.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BDEV_LOGICAL_BLOCK_SIZE], [
-	AC_MSG_CHECKING([whether bdev_logical_block_size() is available])
+	ZFS_LINUX_TEST_SRC([bdev_logical_block_size], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
 		struct block_device *bdev = NULL;
 		bdev_logical_block_size(bdev);
-	],[
+	], [$NO_UNUSED_BUT_SET_VARIABLE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE], [
+	AC_MSG_CHECKING([whether bdev_logical_block_size() is available])
+	ZFS_LINUX_TEST_RESULT([bdev_logical_block_size], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BDEV_LOGICAL_BLOCK_SIZE, 1,
-		          [bdev_logical_block_size() is available])
+		    [bdev_logical_block_size() is available])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-bdev-physical-size.m4

@@ -19,21 +19,22 @@ dnl #
 dnl # Unfortunately, this interface isn't entirely reliable because
 dnl # drives are sometimes known to misreport this value.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BDEV_PHYSICAL_BLOCK_SIZE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BDEV_PHYSICAL_BLOCK_SIZE], [
-	AC_MSG_CHECKING([whether bdev_physical_block_size() is available])
+	ZFS_LINUX_TEST_SRC([bdev_physical_block_size], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
 		struct block_device *bdev = NULL;
 		bdev_physical_block_size(bdev);
-	],[
+	], [$NO_UNUSED_BUT_SET_VARIABLE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BDEV_PHYSICAL_BLOCK_SIZE], [
+	AC_MSG_CHECKING([whether bdev_physical_block_size() is available])
+	ZFS_LINUX_TEST_RESULT([bdev_physical_block_size], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BDEV_PHYSICAL_BLOCK_SIZE, 1,
-		          [bdev_physical_block_size() is available])
+		    [bdev_physical_block_size() is available])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-bdi.m4

@@ -1,55 +1,81 @@
 dnl #
-dnl # 2.6.32 - 2.6.33, bdi_setup_and_register() is not exported.
+dnl # Check available BDI interfaces.
-dnl # 2.6.34 - 3.19, bdi_setup_and_register() takes 3 arguments.
-dnl # 4.0 - 4.11, bdi_setup_and_register() takes 2 arguments.
-dnl # 4.12 - x.y, super_setup_bdi_name() new interface.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BDI], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BDI], [
-	AC_MSG_CHECKING([whether super_setup_bdi_name() exists])
+	ZFS_LINUX_TEST_SRC([super_setup_bdi_name], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 		struct super_block sb;
 	], [
 		char *name = "bdi";
 		atomic_long_t zfs_bdi_seq;
 		int error __attribute__((unused)) =
-		    super_setup_bdi_name(&sb, "%.28s-%ld", name, atomic_long_inc_return(&zfs_bdi_seq));
+		    super_setup_bdi_name(&sb, "%.28s-%ld", name,
-	], [super_setup_bdi_name], [fs/super.c], [
+		    atomic_long_inc_return(&zfs_bdi_seq));
+	])
+
+	ZFS_LINUX_TEST_SRC([bdi_setup_and_register], [
+		#include <linux/backing-dev.h>
+		struct backing_dev_info bdi;
+	], [
+		char *name = "bdi";
+		int error __attribute__((unused)) =
+		    bdi_setup_and_register(&bdi, name);
+	])
+
+	ZFS_LINUX_TEST_SRC([bdi_setup_and_register_3args], [
+		#include <linux/backing-dev.h>
+		struct backing_dev_info bdi;
+	], [
+		char *name = "bdi";
+		unsigned int cap = BDI_CAP_MAP_COPY;
+		int error __attribute__((unused)) =
+		    bdi_setup_and_register(&bdi, name, cap);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BDI], [
+	dnl #
+	dnl # 4.12, super_setup_bdi_name() introduced.
+	dnl #
+	AC_MSG_CHECKING([whether super_setup_bdi_name() exists])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([super_setup_bdi_name],
+	    [super_setup_bdi_name], [fs/super.c], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SUPER_SETUP_BDI_NAME, 1,
                     [super_setup_bdi_name() exits])
 	], [
 		AC_MSG_RESULT(no)
+
+		dnl #
+		dnl # 4.0 - 4.11, bdi_setup_and_register() takes 2 arguments.
+		dnl #
 		AC_MSG_CHECKING(
 		    [whether bdi_setup_and_register() wants 2 args])
-		ZFS_LINUX_TRY_COMPILE_SYMBOL([
+		ZFS_LINUX_TEST_RESULT_SYMBOL([bdi_setup_and_register],
-			#include <linux/backing-dev.h>
+		    [bdi_setup_and_register], [mm/backing-dev.c], [
-			struct backing_dev_info bdi;
-		], [
-			char *name = "bdi";
-			int error __attribute__((unused)) =
-			    bdi_setup_and_register(&bdi, name);
-		], [bdi_setup_and_register], [mm/backing-dev.c], [
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_2ARGS_BDI_SETUP_AND_REGISTER, 1,
 			    [bdi_setup_and_register() wants 2 args])
 		], [
 			AC_MSG_RESULT(no)
+
+			dnl #
+			dnl # 2.6.34 - 3.19, bdi_setup_and_register()
+			dnl # takes 3 arguments.
+			dnl #
 			AC_MSG_CHECKING(
 			    [whether bdi_setup_and_register() wants 3 args])
-			ZFS_LINUX_TRY_COMPILE_SYMBOL([
+			ZFS_LINUX_TEST_RESULT_SYMBOL(
-				#include <linux/backing-dev.h>
+			    [bdi_setup_and_register_3args],
-				struct backing_dev_info bdi;
+			    [bdi_setup_and_register], [mm/backing-dev.c], [
-			], [
-				char *name = "bdi";
-				unsigned int cap = BDI_CAP_MAP_COPY;
-				int error __attribute__((unused)) =
-				    bdi_setup_and_register(&bdi, name, cap);
-			], [bdi_setup_and_register], [mm/backing-dev.c], [
 				AC_MSG_RESULT(yes)
 				AC_DEFINE(HAVE_3ARGS_BDI_SETUP_AND_REGISTER, 1,
 				    [bdi_setup_and_register() wants 3 args])
 			], [
+				dnl #
+				dnl # 2.6.32 - 2.6.33, bdi_setup_and_register()
+				dnl # is not exported.
+				dnl #
 				AC_MSG_RESULT(no)
 			])
 		])

config/kernel-bio-bvec-iter.m4

@@ -3,18 +3,21 @@ dnl # 3.14 API change,
 dnl # Immutable biovecs. A number of fields of struct bio are moved to
 dnl # struct bvec_iter.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BIO_BVEC_ITER], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_BVEC_ITER], [
-	AC_MSG_CHECKING([whether bio has bi_iter])
+	ZFS_LINUX_TEST_SRC([bio_bvec_iter], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/bio.h>
 	],[
 		struct bio bio;
 		bio.bi_iter.bi_sector = 0;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_BVEC_ITER], [
+	AC_MSG_CHECKING([whether bio has bi_iter])
+	ZFS_LINUX_TEST_RESULT([bio_bvec_iter], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BIO_BVEC_ITER, 1, [bio has bi_iter])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
-

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_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_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([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_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_DEFUN([ZFS_AC_KERNEL_SRC_BIO_BI_STATUS], [
-	AC_MSG_CHECKING([whether bio->bi_status exists])
+	ZFS_LINUX_TEST_SRC([bio_bi_status], [
-	ZFS_LINUX_TRY_COMPILE([
 		#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])
 	],[

config/kernel-bio-failfast.m4

@@ -3,37 +3,54 @@ dnl # Preferred interface for setting FAILFAST on a bio:
 dnl #   2.6.28-2.6.35: BIO_RW_FAILFAST_{DEV|TRANSPORT|DRIVER}
 dnl #       >= 2.6.36: REQ_FAILFAST_{DEV|TRANSPORT|DRIVER}
 dnl #
-
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_FAILFAST_DTD], [
-AC_DEFUN([ZFS_AC_KERNEL_BIO_FAILFAST_DTD], [
+	ZFS_LINUX_TEST_SRC([bio_failfast_dtd], [
-	AC_MSG_CHECKING([whether BIO_RW_FAILFAST_* are defined])
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/bio.h>
 	],[
 		int flags __attribute__ ((unused));
 		flags = ((1 << BIO_RW_FAILFAST_DEV) |
 			 (1 << BIO_RW_FAILFAST_TRANSPORT) |
 			 (1 << BIO_RW_FAILFAST_DRIVER));
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_FAILFAST_DTD], [
+	AC_MSG_CHECKING([whether BIO_RW_FAILFAST_* are defined])
+	ZFS_LINUX_TEST_RESULT([bio_failfast_dtd], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BIO_RW_FAILFAST_DTD, 1,
-		          [BIO_RW_FAILFAST_* are defined])
+		    [BIO_RW_FAILFAST_* are defined])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
 
-AC_DEFUN([ZFS_AC_KERNEL_REQ_FAILFAST_MASK], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_REQ_FAILFAST_MASK], [
-	AC_MSG_CHECKING([whether REQ_FAILFAST_MASK is defined])
+	ZFS_LINUX_TEST_SRC([bio_failfast_mask], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/bio.h>
 	],[
 		int flags __attribute__ ((unused));
 		flags = REQ_FAILFAST_MASK;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_REQ_FAILFAST_MASK], [
+	AC_MSG_CHECKING([whether REQ_FAILFAST_MASK is defined])
+	ZFS_LINUX_TEST_RESULT([bio_failfast_mask], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_REQ_FAILFAST_MASK, 1,
-		          [REQ_FAILFAST_MASK is defined])
+		    [REQ_FAILFAST_MASK is defined])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_FAILFAST], [
+	ZFS_AC_KERNEL_SRC_BIO_FAILFAST_DTD
+	ZFS_AC_KERNEL_SRC_REQ_FAILFAST_MASK
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_FAILFAST], [
+	ZFS_AC_KERNEL_BIO_FAILFAST_DTD
+	ZFS_AC_KERNEL_REQ_FAILFAST_MASK
+])

config/kernel-bio-op.m4

@@ -5,13 +5,43 @@ dnl # The bio_op() helper was introduced as a replacement for explicitly
 dnl # checking the bio->bi_rw flags.  The following checks are used to
 dnl # detect if a specific operation is supported.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_REQ_OP_DISCARD], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_OPS], [
-	AC_MSG_CHECKING([whether REQ_OP_DISCARD is defined])
+	ZFS_LINUX_TEST_SRC([req_op_discard], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blk_types.h>
 	],[
 		int op __attribute__ ((unused)) = REQ_OP_DISCARD;
+	])
+
+	ZFS_LINUX_TEST_SRC([req_op_secure_erase], [
+		#include <linux/blk_types.h>
 	],[
+		int op __attribute__ ((unused)) = REQ_OP_SECURE_ERASE;
+	])
+
+	ZFS_LINUX_TEST_SRC([req_op_flush], [
+		#include <linux/blk_types.h>
+	],[
+		int op __attribute__ ((unused)) = REQ_OP_FLUSH;
+	])
+
+	ZFS_LINUX_TEST_SRC([bio_bi_opf], [
+		#include <linux/bio.h>
+	],[
+		struct bio bio __attribute__ ((unused));
+		bio.bi_opf = 0;
+	])
+
+	ZFS_LINUX_TEST_SRC([bio_set_op_attrs], [
+		#include <linux/bio.h>
+	],[
+		struct bio *bio __attribute__ ((unused)) = NULL;
+		bio_set_op_attrs(bio, 0, 0);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_REQ_OP_DISCARD], [
+	AC_MSG_CHECKING([whether REQ_OP_DISCARD is defined])
+	ZFS_LINUX_TEST_RESULT([req_op_discard], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_REQ_OP_DISCARD, 1,
 		    [REQ_OP_DISCARD is defined])
@@ -22,11 +52,7 @@ AC_DEFUN([ZFS_AC_KERNEL_REQ_OP_DISCARD], [
 
 AC_DEFUN([ZFS_AC_KERNEL_REQ_OP_SECURE_ERASE], [
 	AC_MSG_CHECKING([whether REQ_OP_SECURE_ERASE is defined])
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([req_op_secure_erase], [
-		#include <linux/blk_types.h>
-	],[
-		int op __attribute__ ((unused)) = REQ_OP_SECURE_ERASE;
-	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_REQ_OP_SECURE_ERASE, 1,
 		    [REQ_OP_SECURE_ERASE is defined])
@@ -38,14 +64,9 @@ AC_DEFUN([ZFS_AC_KERNEL_REQ_OP_SECURE_ERASE], [
 
 AC_DEFUN([ZFS_AC_KERNEL_REQ_OP_FLUSH], [
 	AC_MSG_CHECKING([whether REQ_OP_FLUSH is defined])
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([req_op_flush], [
-		#include <linux/blk_types.h>
-	],[
-		int op __attribute__ ((unused)) = REQ_OP_FLUSH;
-	],[
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_REQ_OP_FLUSH, 1,
+		AC_DEFINE(HAVE_REQ_OP_FLUSH, 1, [REQ_OP_FLUSH is defined])
-		    [REQ_OP_FLUSH is defined])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -53,12 +74,7 @@ AC_DEFUN([ZFS_AC_KERNEL_REQ_OP_FLUSH], [
 
 AC_DEFUN([ZFS_AC_KERNEL_BIO_BI_OPF], [
 	AC_MSG_CHECKING([whether bio->bi_opf is defined])
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([bio_bi_opf], [
-		#include <linux/bio.h>
-	],[
-		struct bio bio __attribute__ ((unused));
-		bio.bi_opf = 0;
-	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BIO_BI_OPF, 1, [bio->bi_opf is defined])
 	],[
@@ -68,13 +84,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_BI_OPF], [
 
 AC_DEFUN([ZFS_AC_KERNEL_HAVE_BIO_SET_OP_ATTRS], [
 	AC_MSG_CHECKING([whether bio_set_op_attrs is available])
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([bio_set_op_attrs], [
-		#include <linux/bio.h>
-	],[
-		struct bio *bio __attribute__ ((unused)) = NULL;
-
-		bio_set_op_attrs(bio, 0, 0);
-	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BIO_SET_OP_ATTRS, 1,
 		    [bio_set_op_attrs is available])
@@ -82,3 +92,11 @@ AC_DEFUN([ZFS_AC_KERNEL_HAVE_BIO_SET_OP_ATTRS], [
 		AC_MSG_RESULT(no)
 	])
 ])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_OPS], [
+	ZFS_AC_KERNEL_REQ_OP_DISCARD
+	ZFS_AC_KERNEL_REQ_OP_SECURE_ERASE
+	ZFS_AC_KERNEL_REQ_OP_FLUSH
+	ZFS_AC_KERNEL_BIO_BI_OPF
+	ZFS_AC_KERNEL_HAVE_BIO_SET_OP_ATTRS
+])

config/kernel-bio-rw-barrier.m4

@@ -3,20 +3,25 @@ dnl # Interface for issuing a discard bio:
 dnl # 2.6.28-2.6.35: BIO_RW_BARRIER
 dnl # 2.6.36-3.x:    REQ_BARRIER
 dnl #
-
+dnl #
 dnl # Since REQ_BARRIER is a preprocessor definition, there is no need for an
 dnl # autotools check for it. Also, REQ_BARRIER existed in the request layer
 dnl # until torvalds/linux@7b6d91daee5cac6402186ff224c3af39d79f4a0e unified the
 dnl # request layer and bio layer flags, so it would be wrong to assume that
 dnl # the APIs are mutually exclusive contrary to the typical case.
-AC_DEFUN([ZFS_AC_KERNEL_BIO_RW_BARRIER], [
+dnl #
-	AC_MSG_CHECKING([whether BIO_RW_BARRIER is defined])
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_RW_BARRIER], [
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_SRC([bio_rw_barrier], [
 		#include <linux/bio.h>
 	],[
 		int flags __attribute__ ((unused));
 		flags = BIO_RW_BARRIER;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_RW_BARRIER], [
+	AC_MSG_CHECKING([whether BIO_RW_BARRIER is defined])
+	ZFS_LINUX_TEST_RESULT([bio_rw_barrier], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BIO_RW_BARRIER, 1, [BIO_RW_BARRIER is defined])
 	],[

config/kernel-bio-rw-discard.m4

@@ -3,20 +3,25 @@ dnl # Interface for issuing a discard bio:
 dnl # 2.6.28-2.6.35: BIO_RW_DISCARD
 dnl # 2.6.36-3.x:    REQ_DISCARD
 dnl #
-
+dnl #
 dnl # Since REQ_DISCARD is a preprocessor definition, there is no need for an
 dnl # autotools check for it. Also, REQ_DISCARD existed in the request layer
 dnl # until torvalds/linux@7b6d91daee5cac6402186ff224c3af39d79f4a0e unified the
 dnl # request layer and bio layer flags, so it would be wrong to assume that
 dnl # the APIs are mutually exclusive contrary to the typical case.
-AC_DEFUN([ZFS_AC_KERNEL_BIO_RW_DISCARD], [
+dnl #
-	AC_MSG_CHECKING([whether BIO_RW_DISCARD is defined])
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_RW_DISCARD], [
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_SRC([bio_rw_discard], [
 		#include <linux/bio.h>
 	],[
 		int flags __attribute__ ((unused));
 		flags = BIO_RW_DISCARD;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BIO_RW_DISCARD], [
+	AC_MSG_CHECKING([whether BIO_RW_DISCARD is defined])
+	ZFS_LINUX_TEST_RESULT([bio_rw_discard], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BIO_RW_DISCARD, 1, [BIO_RW_DISCARD is defined])
 	],[

config/kernel-bio_set_dev.m4

@@ -3,51 +3,38 @@ dnl # Linux 4.14 API,
 dnl #
 dnl # The bio_set_dev() helper macro was introduced as part of the transition
 dnl # to have struct gendisk in struct bio. 
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BIO_SET_DEV_MACRO], [
-	AC_MSG_CHECKING([whether bio_set_dev() exists])
-	ZFS_LINUX_TRY_COMPILE([
-		#include <linux/bio.h>
-		#include <linux/fs.h>
-	],[
-		struct block_device *bdev = NULL;
-		struct bio *bio = NULL;
-		bio_set_dev(bio, bdev);
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BIO_SET_DEV, 1, [bio_set_dev() exists])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
 dnl #
 dnl # Linux 5.0 API,
 dnl #
 dnl # The bio_set_dev() helper macro was updated to internally depend on
 dnl # bio_associate_blkg() symbol which is exported GPL-only.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BIO_SET_DEV_GPL_ONLY], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_SET_DEV], [
-	AC_MSG_CHECKING([whether bio_set_dev() is GPL-only])
+	ZFS_LINUX_TEST_SRC([bio_set_dev], [
-	ZFS_LINUX_TRY_COMPILE([
-		#include <linux/module.h>
 		#include <linux/bio.h>
 		#include <linux/fs.h>
-		MODULE_LICENSE("$ZFS_META_LICENSE");
 	],[
 		struct block_device *bdev = NULL;
 		struct bio *bio = NULL;
 		bio_set_dev(bio, bdev);
-	],[
+	], [], [$ZFS_META_LICENSE])
-		AC_MSG_RESULT(no)
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BIO_SET_DEV_GPL_ONLY, 1,
-		    [bio_set_dev() GPL-only])
-	])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_BIO_SET_DEV], [
-	ZFS_AC_KERNEL_BIO_SET_DEV_MACRO
+	AC_MSG_CHECKING([whether bio_set_dev() is available])
-	ZFS_AC_KERNEL_BIO_SET_DEV_GPL_ONLY
+	ZFS_LINUX_TEST_RESULT([bio_set_dev], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_BIO_SET_DEV, 1, [bio_set_dev() is available])
+
+		AC_MSG_CHECKING([whether bio_set_dev() is GPL-only])
+		ZFS_LINUX_TEST_RESULT([bio_set_dev_license], [
+			AC_MSG_RESULT(no)
+		],[
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_BIO_SET_DEV_GPL_ONLY, 1,
+			    [bio_set_dev() GPL-only])
+		])
+	],[
+		AC_MSG_RESULT(no)
+	])
 ])

config/kernel-blk-queue-bdi.m4

@@ -2,15 +2,19 @@ dnl #
 dnl # 2.6.32 - 4.11, statically allocated bdi in request_queue
 dnl # 4.12 - x.y, dynamically allocated bdi in request_queue
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_BDI], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_BDI], [
-	AC_MSG_CHECKING([whether blk_queue bdi is dynamic])
+	ZFS_LINUX_TEST_SRC([blk_queue_bdi], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
 		struct request_queue q;
 		struct backing_dev_info bdi;
 		q.backing_dev_info = &bdi;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_BDI], [
+	AC_MSG_CHECKING([whether blk_queue bdi is dynamic])
+	ZFS_LINUX_TEST_RESULT([blk_queue_bdi], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_BDI_DYNAMIC, 1,
 		    [blk queue backing_dev_info is dynamic])

config/kernel-blk-queue-discard.m4

@@ -2,16 +2,19 @@ dnl #
 dnl # 2.6.32 - 4.x API,
 dnl #   blk_queue_discard()
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_DISCARD], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_DISCARD], [
-	AC_MSG_CHECKING([whether blk_queue_discard() is available])
+	ZFS_LINUX_TEST_SRC([blk_queue_discard], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
 		struct request_queue *q __attribute__ ((unused)) = NULL;
 		int value __attribute__ ((unused));
-
 		value = blk_queue_discard(q);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_DISCARD], [
+	AC_MSG_CHECKING([whether blk_queue_discard() is available])
+	ZFS_LINUX_TEST_RESULT([blk_queue_discard], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_DISCARD, 1,
 		    [blk_queue_discard() is available])
@@ -30,16 +33,27 @@ dnl #
 dnl # 2.6.x - 2.6.35 API,
 dnl #   Unsupported by kernel
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_SECURE_ERASE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_SECURE_ERASE], [
-	AC_MSG_CHECKING([whether blk_queue_secure_erase() is available])
+	ZFS_LINUX_TEST_SRC([blk_queue_secure_erase], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
 		struct request_queue *q __attribute__ ((unused)) = NULL;
 		int value __attribute__ ((unused));
-
 		value = blk_queue_secure_erase(q);
+	])
+
+	ZFS_LINUX_TEST_SRC([blk_queue_secdiscard], [
+		#include <linux/blkdev.h>
 	],[
+		struct request_queue *q __attribute__ ((unused)) = NULL;
+		int value __attribute__ ((unused));
+		value = blk_queue_secdiscard(q);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_SECURE_ERASE], [
+	AC_MSG_CHECKING([whether blk_queue_secure_erase() is available])
+	ZFS_LINUX_TEST_RESULT([blk_queue_secure_erase], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_SECURE_ERASE, 1,
 		    [blk_queue_secure_erase() is available])
@@ -47,14 +61,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_SECURE_ERASE], [
 		AC_MSG_RESULT(no)
 
 		AC_MSG_CHECKING([whether blk_queue_secdiscard() is available])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([blk_queue_secdiscard], [
-			#include <linux/blkdev.h>
-		],[
-			struct request_queue *q __attribute__ ((unused)) = NULL;
-			int value __attribute__ ((unused));
-
-			value = blk_queue_secdiscard(q);
-		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_BLK_QUEUE_SECDISCARD, 1,
 			    [blk_queue_secdiscard() is available])

config/kernel-blk-queue-flags.m4

@@ -3,36 +3,54 @@ dnl # API change
 dnl # https://github.com/torvalds/linux/commit/8814ce8
 dnl # Introduction of blk_queue_flag_set and blk_queue_flag_clear
 dnl #
-
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_FLAG_SET], [
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAG_SET], [
+	ZFS_LINUX_TEST_SRC([blk_queue_flag_set], [
-	AC_MSG_CHECKING([whether blk_queue_flag_set() exists])
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/kernel.h>
 		#include <linux/blkdev.h>
 	],[
 		struct request_queue *q = NULL;
 		blk_queue_flag_set(0, q);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAG_SET], [
+	AC_MSG_CHECKING([whether blk_queue_flag_set() exists])
+	ZFS_LINUX_TEST_RESULT([blk_queue_flag_set], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BLK_QUEUE_FLAG_SET, 1, [blk_queue_flag_set() exists])
+		AC_DEFINE(HAVE_BLK_QUEUE_FLAG_SET, 1,
+		    [blk_queue_flag_set() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
 
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAG_CLEAR], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_FLAG_CLEAR], [
-	AC_MSG_CHECKING([whether blk_queue_flag_clear() exists])
+	ZFS_LINUX_TEST_SRC([blk_queue_flag_clear], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/kernel.h>
 		#include <linux/blkdev.h>
 	],[
 		struct request_queue *q = NULL;
 		blk_queue_flag_clear(0, q);
-	],[
+	])
+])
 
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAG_CLEAR], [
+	AC_MSG_CHECKING([whether blk_queue_flag_clear() exists])
+	ZFS_LINUX_TEST_RESULT([blk_queue_flag_clear], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BLK_QUEUE_FLAG_CLEAR, 1, [blk_queue_flag_clear() exists])
+		AC_DEFINE(HAVE_BLK_QUEUE_FLAG_CLEAR, 1,
+		    [blk_queue_flag_clear() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_FLAGS], [
+	ZFS_AC_KERNEL_SRC_BLK_QUEUE_FLAG_SET
+	ZFS_AC_KERNEL_SRC_BLK_QUEUE_FLAG_CLEAR
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAGS], [
+	ZFS_AC_KERNEL_BLK_QUEUE_FLAG_SET
+	ZFS_AC_KERNEL_BLK_QUEUE_FLAG_CLEAR
+])

config/kernel-blk-queue-flush.m4

@@ -9,35 +9,37 @@ dnl # there we implement our own compatibility function, otherwise
 dnl # we use the function.  The hope is that long term this function
 dnl # will be opened up.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLUSH], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_FLUSH], [
-	AC_MSG_CHECKING([whether blk_queue_flush() is available])
+	ZFS_LINUX_TEST_SRC([blk_queue_flush], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
-	],[
+	], [
 		struct request_queue *q = NULL;
 		(void) blk_queue_flush(q, REQ_FLUSH);
-	],[
+	], [$NO_UNUSED_BUT_SET_VARIABLE], [$ZFS_META_LICENSE])
+
+	ZFS_LINUX_TEST_SRC([blk_queue_write_cache], [
+		#include <linux/kernel.h>
+		#include <linux/blkdev.h>
+	], [
+		struct request_queue *q = NULL;
+		blk_queue_write_cache(q, true, true);
+	], [$NO_UNUSED_BUT_SET_VARIABLE], [$ZFS_META_LICENSE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLUSH], [
+	AC_MSG_CHECKING([whether blk_queue_flush() is available])
+	ZFS_LINUX_TEST_RESULT([blk_queue_flush], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_FLUSH, 1,
-		          [blk_queue_flush() is available])
+		    [blk_queue_flush() is available])
 
 		AC_MSG_CHECKING([whether blk_queue_flush() is GPL-only])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([blk_queue_flush_license], [
-			#include <linux/module.h>
-			#include <linux/blkdev.h>
-
-			MODULE_LICENSE("$ZFS_META_LICENSE");
-		],[
-			struct request_queue *q = NULL;
-			(void) blk_queue_flush(q, REQ_FLUSH);
-		],[
 			AC_MSG_RESULT(no)
 		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_BLK_QUEUE_FLUSH_GPL_ONLY, 1,
-				  [blk_queue_flush() is GPL-only])
+			    [blk_queue_flush() is GPL-only])
 		])
 	],[
 		AC_MSG_RESULT(no)
@@ -48,38 +50,20 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLUSH], [
 	dnl # Replace blk_queue_flush with blk_queue_write_cache
 	dnl #
 	AC_MSG_CHECKING([whether blk_queue_write_cache() exists])
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([blk_queue_write_cache], [
-		#include <linux/kernel.h>
-		#include <linux/blkdev.h>
-
-	],[
-		struct request_queue *q = NULL;
-		blk_queue_write_cache(q, true, true);
-	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_WRITE_CACHE, 1,
-			[blk_queue_write_cache() exists])
+		    [blk_queue_write_cache() exists])
 
 		AC_MSG_CHECKING([whether blk_queue_write_cache() is GPL-only])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([blk_queue_write_cache_license], [
-			#include <linux/kernel.h>
-			#include <linux/module.h>
-			#include <linux/blkdev.h>
-
-			MODULE_LICENSE("$ZFS_META_LICENSE");
-		],[
-			struct request_queue *q = NULL;
-			blk_queue_write_cache(q, true, true);
-		],[
 			AC_MSG_RESULT(no)
 		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY, 1,
-				  [blk_queue_write_cache() is GPL-only])
+			    [blk_queue_write_cache() is GPL-only])
 		])
 	],[
 		AC_MSG_RESULT(no)
 	])
-
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-blk-queue-max-hw-sectors.m4

@@ -2,21 +2,22 @@ dnl #
 dnl # 2.6.34 API change
 dnl # blk_queue_max_hw_sectors() replaces blk_queue_max_sectors().
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_MAX_HW_SECTORS], [
-	AC_MSG_CHECKING([whether blk_queue_max_hw_sectors() is available])
+	ZFS_LINUX_TEST_SRC([blk_queue_max_hw_sectors], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
-	],[
+	], [
 		struct request_queue *q = NULL;
 		(void) blk_queue_max_hw_sectors(q, BLK_SAFE_MAX_SECTORS);
-	],[
+	], [$NO_UNUSED_BUT_SET_VARIABLE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS], [
+	AC_MSG_CHECKING([whether blk_queue_max_hw_sectors() is available])
+	ZFS_LINUX_TEST_RESULT([blk_queue_max_hw_sectors], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_MAX_HW_SECTORS, 1,
-		          [blk_queue_max_hw_sectors() is available])
+		    [blk_queue_max_hw_sectors() is available])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-blk-queue-max-segments.m4

@@ -3,21 +3,22 @@ dnl # 2.6.34 API change
 dnl # blk_queue_max_segments() consolidates blk_queue_max_hw_segments()
 dnl # and blk_queue_max_phys_segments().
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_MAX_SEGMENTS], [
-	AC_MSG_CHECKING([whether blk_queue_max_segments() is available])
+	ZFS_LINUX_TEST_SRC([blk_queue_max_segments], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
-	],[
+	], [
 		struct request_queue *q = NULL;
 		(void) blk_queue_max_segments(q, BLK_MAX_SEGMENTS);
-	],[
+	], [$NO_UNUSED_BUT_SET_VARIABLE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS], [
+	AC_MSG_CHECKING([whether blk_queue_max_segments() is available])
+	ZFS_LINUX_TEST_RESULT([blk_queue_max_segments], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_MAX_SEGMENTS, 1,
-		          [blk_queue_max_segments() is available])
+		    [blk_queue_max_segments() is available])
-	],[
+	], [
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-blk-queue-unplug.m4

@@ -2,43 +2,53 @@ dnl #
 dnl # 2.6.32-2.6.35 API - The BIO_RW_UNPLUG enum can be used as a hint
 dnl # to unplug the queue.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_HAVE_BIO_RW_UNPLUG], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_RW_UNPLUG], [
-	AC_MSG_CHECKING([whether the BIO_RW_UNPLUG enum is available])
+	ZFS_LINUX_TEST_SRC([blk_queue_bio_rw_unplug], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
-		extern enum bio_rw_flags rw;
+		enum bio_rw_flags rw __attribute__ ((unused)) = BIO_RW_UNPLUG;
+	])
+])
 
-		rw = BIO_RW_UNPLUG;
+AC_DEFUN([ZFS_AC_KERNEL_BIO_RW_UNPLUG], [
-	],[
+	AC_MSG_CHECKING([whether the BIO_RW_UNPLUG enum is available])
+	ZFS_LINUX_TEST_RESULT([blk_queue_bio_rw_unplug], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_HAVE_BIO_RW_UNPLUG, 1,
-		          [BIO_RW_UNPLUG is available])
+		    [BIO_RW_UNPLUG is available])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])
 
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_HAVE_BLK_PLUG], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_PLUG], [
-	AC_MSG_CHECKING([whether struct blk_plug is available])
+	ZFS_LINUX_TEST_SRC([blk_plug], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
-		struct blk_plug plug;
+		struct blk_plug plug __attribute__ ((unused));
 
 		blk_start_plug(&plug);
 		blk_finish_plug(&plug);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_PLUG], [
+	AC_MSG_CHECKING([whether struct blk_plug is available])
+	ZFS_LINUX_TEST_RESULT([blk_plug], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_QUEUE_HAVE_BLK_PLUG, 1,
-		          [struct blk_plug is available])
+		    [struct blk_plug is available])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_PLUG], [
+	ZFS_AC_KERNEL_SRC_BIO_RW_UNPLUG
+	ZFS_AC_KERNEL_SRC_BLK_PLUG
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_PLUG], [
+	ZFS_AC_KERNEL_BIO_RW_UNPLUG
+	ZFS_AC_KERNEL_BLK_PLUG
 ])

config/kernel-blkdev-get-by-path.m4

@@ -3,16 +3,21 @@ dnl # 2.6.38 API change
 dnl # open_bdev_exclusive() changed to blkdev_get_by_path()
 dnl # close_bdev_exclusive() changed to blkdev_put()
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_GET_BY_PATH],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_GET_BY_PATH], [
-	[AC_MSG_CHECKING([whether blkdev_get_by_path() is available])
+	ZFS_LINUX_TEST_SRC([blkdev_get_by_path], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 	], [
 		blkdev_get_by_path(NULL, 0, NULL);
-	], [blkdev_get_by_path], [fs/block_dev.c], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_GET_BY_PATH], [
+	AC_MSG_CHECKING([whether blkdev_get_by_path() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([blkdev_get_by_path],
+	    [blkdev_get_by_path], [fs/block_dev.c], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLKDEV_GET_BY_PATH, 1,
-		          [blkdev_get_by_path() is available])
+		    [blkdev_get_by_path() is available])
 	], [
 		AC_MSG_RESULT(no)
 	])

config/kernel-blkdev-reread-part.m4

@@ -2,16 +2,20 @@ dnl #
 dnl # 4.1 API, exported blkdev_reread_part() symbol, backported to the
 dnl # 3.10.0 CentOS 7.x enterprise kernels.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_REREAD_PART], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_REREAD_PART], [
-	AC_MSG_CHECKING([whether blkdev_reread_part() is available])
+	ZFS_LINUX_TEST_SRC([blkdev_reread_part], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	], [
 		struct block_device *bdev = NULL;
 		int error;
 
 		error = blkdev_reread_part(bdev);
-	], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_REREAD_PART], [
+	AC_MSG_CHECKING([whether blkdev_reread_part() is available])
+	ZFS_LINUX_TEST_RESULT([blkdev_reread_part], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLKDEV_REREAD_PART, 1,
 		    [blkdev_reread_part() is available])

config/kernel-block-device-operations.m4

@@ -1,11 +1,8 @@
 dnl #
 dnl # 2.6.38 API change
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
-	AC_MSG_CHECKING([whether bops->check_events() exists])
+	ZFS_LINUX_TEST_SRC([block_device_operations_check_events], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 
 		unsigned int blk_check_events(struct gendisk *disk,
@@ -15,25 +12,25 @@ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
 		    bops __attribute__ ((unused)) = {
 			.check_events	= blk_check_events,
 		};
-	],[
+	], [], [$NO_UNUSED_BUT_SET_VARIABLE])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
+	AC_MSG_CHECKING([whether bops->check_events() exists])
+	ZFS_LINUX_TEST_RESULT([block_device_operations_check_events], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS, 1,
 		    [bops->check_events() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])
 
 dnl #
 dnl # 3.10.x API change
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
-	AC_MSG_CHECKING([whether bops->release() is void])
+	ZFS_LINUX_TEST_SRC([block_device_operations_release_void], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 
 		void blk_release(struct gendisk *g, fmode_t mode) { return; }
@@ -45,13 +42,26 @@ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
 			.ioctl		= NULL,
 			.compat_ioctl	= NULL,
 		};
-	],[
+	], [], [$NO_UNUSED_BUT_SET_VARIABLE])
-	],[
+])
-		AC_MSG_RESULT(void)
+
+AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
+	AC_MSG_CHECKING([whether bops->release() is void])
+	ZFS_LINUX_TEST_RESULT([block_device_operations_release_void], [
+		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID, 1,
 		          [bops->release() returns void])
 	],[
-		AC_MSG_RESULT(int)
+		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS], [
+	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS
+	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS], [
+	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS
+	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
 ])

config/kernel-clear-inode.m4

@@ -19,13 +19,18 @@ dnl # Therefore, to ensure we have the correct API we only allow the
 dnl # clear_inode() compatibility code to be defined iff the evict_inode()
 dnl # functionality is also detected.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CLEAR_INODE],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CLEAR_INODE], [
-	[AC_MSG_CHECKING([whether clear_inode() is available])
+	ZFS_LINUX_TEST_SRC([clear_inode], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 	], [
 		clear_inode(NULL);
-	], [clear_inode], [fs/inode.c], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CLEAR_INODE], [
+	AC_MSG_CHECKING([whether clear_inode() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([clear_inode],
+	    [clear_inode], [fs/inode.c], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_CLEAR_INODE, 1, [clear_inode() is available])
 	], [

config/kernel-commit-metadata.m4

@@ -4,19 +4,22 @@ dnl # Added eops->commit_metadata() callback to allow the underlying
 dnl # filesystem to determine the most efficient way to commit the inode.
 dnl # Prior to this the nfs server would issue an explicit fsync().
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_COMMIT_METADATA], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_COMMIT_METADATA], [
-	AC_MSG_CHECKING([whether eops->commit_metadata() exists])
+	ZFS_LINUX_TEST_SRC([export_operations_commit_metadata], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/exportfs.h>
 		int commit_metadata(struct inode *inode) { return 0; }
 		static struct export_operations eops __attribute__ ((unused))={
 			.commit_metadata = commit_metadata,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_COMMIT_METADATA], [
+	AC_MSG_CHECKING([whether eops->commit_metadata() exists])
+	ZFS_LINUX_TEST_RESULT([export_operations_commit_metadata], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_COMMIT_METADATA, 1,
-		          [eops->commit_metadata() exists])
+		    [eops->commit_metadata() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-config-defined.m4

@@ -0,0 +1,183 @@
+dnl #
+dnl # Certain kernel build options are not supported.  These must be
+dnl # detected at configure time and cause a build failure.  Otherwise
+dnl # modules may be successfully built that behave incorrectly.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_CONFIG_DEFINED], [
+	AS_IF([test "x$cross_compiling" != xyes], [
+		AC_RUN_IFELSE([
+			AC_LANG_PROGRAM([
+				#include "$LINUX/include/linux/license.h"
+			], [
+				return !license_is_gpl_compatible(
+				    "$ZFS_META_LICENSE");
+			])
+		], [
+			AC_DEFINE([ZFS_IS_GPL_COMPATIBLE], [1],
+			    [Define to 1 if GPL-only symbols can be used])
+		], [
+		])
+	])
+
+	ZFS_AC_KERNEL_SRC_CONFIG_THREAD_SIZE
+	ZFS_AC_KERNEL_SRC_CONFIG_DEBUG_LOCK_ALLOC
+	ZFS_AC_KERNEL_SRC_CONFIG_TRIM_UNUSED_KSYMS
+	ZFS_AC_KERNEL_SRC_CONFIG_ZLIB_INFLATE
+	ZFS_AC_KERNEL_SRC_CONFIG_ZLIB_DEFLATE
+
+	AC_MSG_CHECKING([for kernel config option compatibility])
+	ZFS_LINUX_TEST_COMPILE_ALL([config])
+	AC_MSG_RESULT([done])
+
+	ZFS_AC_KERNEL_CONFIG_THREAD_SIZE
+	ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC
+	ZFS_AC_KERNEL_CONFIG_TRIM_UNUSED_KSYMS
+	ZFS_AC_KERNEL_CONFIG_ZLIB_INFLATE
+	ZFS_AC_KERNEL_CONFIG_ZLIB_DEFLATE
+])
+
+dnl #
+dnl # Check configured THREAD_SIZE
+dnl #
+dnl # The stack size will vary by architecture, but as of Linux 3.15 on x86_64
+dnl # the default thread stack size was increased to 16K from 8K.  Therefore,
+dnl # on newer kernels and some architectures stack usage optimizations can be
+dnl # conditionally applied to improve performance without negatively impacting
+dnl # stability.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CONFIG_THREAD_SIZE], [
+	ZFS_LINUX_TEST_SRC([config_thread_size], [
+		#include <linux/module.h>
+	],[
+		#if (THREAD_SIZE < 16384)
+		#error "THREAD_SIZE is less than 16K"
+		#endif
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CONFIG_THREAD_SIZE], [
+	AC_MSG_CHECKING([whether kernel was built with 16K or larger stacks])
+	ZFS_LINUX_TEST_RESULT([config_thread_size], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE(HAVE_LARGE_STACKS, 1, [kernel has large stacks])
+	],[
+		AC_MSG_RESULT([no])
+	])
+])
+
+dnl #
+dnl # Check CONFIG_DEBUG_LOCK_ALLOC
+dnl #
+dnl # This is typically only set for debug kernels because it comes with
+dnl # a performance penalty.  However, when it is set it maps the non-GPL
+dnl # symbol mutex_lock() to the GPL-only mutex_lock_nested() symbol.
+dnl # This will cause a failure at link time which we'd rather know about
+dnl # at compile time.
+dnl #
+dnl # Since we plan to pursue making mutex_lock_nested() a non-GPL symbol
+dnl # with the upstream community we add a check to detect this case.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CONFIG_DEBUG_LOCK_ALLOC], [
+	ZFS_LINUX_TEST_SRC([config_debug_lock_alloc], [
+		#include <linux/mutex.h>
+	],[
+		struct mutex lock;
+
+		mutex_init(&lock);
+		mutex_lock(&lock);
+		mutex_unlock(&lock);
+	], [], [$ZFS_META_LICENSE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC], [
+	AC_MSG_CHECKING([whether mutex_lock() is GPL-only])
+	ZFS_LINUX_TEST_RESULT([config_debug_lock_alloc], [
+		AC_MSG_RESULT(no)
+	],[
+		AC_MSG_RESULT(yes)
+		AC_MSG_ERROR([
+	*** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible
+	*** with the CDDL license and will prevent the module linking stage
+	*** from succeeding.  You must rebuild your kernel without this
+	*** option enabled.])
+	])
+])
+
+dnl #
+dnl # Check CONFIG_TRIM_UNUSED_KSYMS
+dnl #
+dnl # Verify the kernel has CONFIG_TRIM_UNUSED_KSYMS disabled.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CONFIG_TRIM_UNUSED_KSYMS], [
+	ZFS_LINUX_TEST_SRC([config_trim_unusued_ksyms], [
+		#if defined(CONFIG_TRIM_UNUSED_KSYMS)
+		#error CONFIG_TRIM_UNUSED_KSYMS not defined
+		#endif
+	],[])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CONFIG_TRIM_UNUSED_KSYMS], [
+	AC_MSG_CHECKING([whether CONFIG_TRIM_UNUSED_KSYM is disabled])
+	ZFS_LINUX_TEST_RESULT([config_trim_unusued_ksyms], [
+		AC_MSG_RESULT([yes])
+	],[
+		AC_MSG_RESULT([no])
+		AS_IF([test "x$enable_linux_builtin" != xyes], [
+			AC_MSG_ERROR([
+	*** This kernel has unused symbols trimming enabled, please disable.
+	*** Rebuild the kernel with CONFIG_TRIM_UNUSED_KSYMS=n set.])
+		])
+	])
+])
+
+dnl #
+dnl # Check CONFIG_ZLIB_INFLATE
+dnl #
+dnl # Verify the kernel has CONFIG_ZLIB_INFLATE support enabled.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CONFIG_ZLIB_INFLATE], [
+	ZFS_LINUX_TEST_SRC([config_zlib_inflate], [
+		#if !defined(CONFIG_ZLIB_INFLATE) && \
+		    !defined(CONFIG_ZLIB_INFLATE_MODULE)
+		#error CONFIG_ZLIB_INFLATE not defined
+		#endif
+	],[])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CONFIG_ZLIB_INFLATE], [
+	AC_MSG_CHECKING([whether CONFIG_ZLIB_INFLATE is defined])
+	ZFS_LINUX_TEST_RESULT([config_zlib_inflate], [
+		AC_MSG_RESULT([yes])
+	],[
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR([
+	*** This kernel does not include the required zlib inflate support.
+	*** Rebuild the kernel with CONFIG_ZLIB_INFLATE=y|m set.])
+	])
+])
+
+dnl #
+dnl # Check CONFIG_ZLIB_DEFLATE
+dnl #
+dnl # Verify the kernel has CONFIG_ZLIB_DEFLATE support enabled.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CONFIG_ZLIB_DEFLATE], [
+	ZFS_LINUX_TEST_SRC([config_zlib_deflate], [
+		#if !defined(CONFIG_ZLIB_DEFLATE) && \
+		    !defined(CONFIG_ZLIB_DEFLATE_MODULE)
+		#error CONFIG_ZLIB_DEFLATE not defined
+		#endif
+	],[])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CONFIG_ZLIB_DEFLATE], [
+	AC_MSG_CHECKING([whether CONFIG_ZLIB_DEFLATE is defined])
+	ZFS_LINUX_TEST_RESULT([config_zlib_deflate], [
+		AC_MSG_RESULT([yes])
+	],[
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR([
+	*** This kernel does not include the required zlib deflate support.
+	*** Rebuild the kernel with CONFIG_ZLIB_DEFLATE=y|m set.])
+	])
+])

config/kernel-create-nameidata.m4

@@ -1,9 +1,8 @@
 dnl #
 dnl # 3.6 API change
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CREATE_NAMEIDATA], [
-	AC_MSG_CHECKING([whether iops->create() passes nameidata])
+	ZFS_LINUX_TEST_SRC([create_nameidata], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		#include <linux/sched.h>
 
@@ -19,11 +18,15 @@ AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [
 		    iops __attribute__ ((unused)) = {
 			.create		= inode_create,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [
+	AC_MSG_CHECKING([whether iops->create() passes nameidata])
+	ZFS_LINUX_TEST_RESULT([create_nameidata], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_CREATE_NAMEIDATA, 1,
-		          [iops->create() passes nameidata])
+		    [iops->create() passes nameidata])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-ctl-table-name.m4

@@ -2,14 +2,18 @@ dnl #
 dnl # 2.6.33 API change,
 dnl # Removed .ctl_name from struct ctl_table.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CTL_NAME], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CTL_NAME], [
-	AC_MSG_CHECKING([whether struct ctl_table has ctl_name])
+	ZFS_LINUX_TEST_SRC([ctl_name], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/sysctl.h>
 	],[
 		struct ctl_table ctl __attribute__ ((unused));
 		ctl.ctl_name = 0;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CTL_NAME], [
+	AC_MSG_CHECKING([whether struct ctl_table has ctl_name])
+	ZFS_LINUX_TEST_RESULT([ctl_name], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_CTL_NAME, 1, [struct ctl_table has ctl_name])
 	],[

config/kernel-current-time.m4

@@ -2,14 +2,19 @@ dnl #
 dnl # 4.9, current_time() added
 dnl # 4.18, return type changed from timespec to timespec64
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CURRENT_TIME],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CURRENT_TIME], [
-	[AC_MSG_CHECKING([whether current_time() exists])
+	ZFS_LINUX_TEST_SRC([current_time], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 	], [
 		struct inode ip __attribute__ ((unused));
 		ip.i_atime = current_time(&ip);
-	], [current_time], [fs/inode.c], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CURRENT_TIME], [
+	AC_MSG_CHECKING([whether current_time() exists])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([current_time],
+	    [current_time], [fs/inode.c], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_CURRENT_TIME, 1, [current_time() exists])
 	], [

config/kernel-current_bio_tail.m4

@@ -4,30 +4,36 @@ dnl # current->bio_tail and current->bio_list were struct bio pointers prior to
 dnl # Linux 2.6.34. They were refactored into a struct bio_list pointer called
 dnl # current->bio_list in Linux 2.6.34.
 dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CURRENT_BIO_TAIL], [
+	ZFS_LINUX_TEST_SRC([current_bio_tail], [
+		#include <linux/sched.h>
+	], [
+		current->bio_tail = (struct bio **) NULL;
+	])
+
+	ZFS_LINUX_TEST_SRC([current_bio_list], [
+		#include <linux/sched.h>
+	], [
+		current->bio_list = (struct bio_list *) NULL;
+	])
+])
+
 AC_DEFUN([ZFS_AC_KERNEL_CURRENT_BIO_TAIL], [
 	AC_MSG_CHECKING([whether current->bio_tail exists])
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([current_bio_tail], [
-		#include <linux/sched.h>
-	],[
-		current->bio_tail = (struct bio **) NULL;
-	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_CURRENT_BIO_TAIL, 1,
 		    [current->bio_tail exists])
 	],[
 		AC_MSG_RESULT(no)
+
 		AC_MSG_CHECKING([whether current->bio_list exists])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([current_bio_list], [
-			#include <linux/sched.h>
-		],[
-			current->bio_list = (struct bio_list *) NULL;
-		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_CURRENT_BIO_LIST, 1,
 			    [current->bio_list exists])
 		],[
-			AC_MSG_ERROR(no - Please file a bug report at
+			ZFS_LINUX_TEST_ERROR([bio_list])
-			    https://github.com/zfsonlinux/zfs/issues/new)
 		])
 	])
 ])

config/kernel-d-make-root.m4

@@ -1,17 +0,0 @@
-dnl #
-dnl # 3.4.0 API change
-dnl # Added d_make_root() to replace previous d_alloc_root() function.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_D_MAKE_ROOT],
-	[AC_MSG_CHECKING([whether d_make_root() is available])
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
-		#include <linux/dcache.h>
-	], [
-		d_make_root(NULL);
-	], [d_make_root], [fs/dcache.c], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_D_MAKE_ROOT, 1, [d_make_root() is available])
-	], [
-		AC_MSG_RESULT(no)
-	])
-])

config/kernel-d-obtain-alias.m4

@@ -1,18 +0,0 @@
-dnl #
-dnl # 2.6.28 API change
-dnl # Added d_obtain_alias() helper function.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_D_OBTAIN_ALIAS],
-	[AC_MSG_CHECKING([whether d_obtain_alias() is available])
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
-		#include <linux/dcache.h>
-	], [
-		d_obtain_alias(NULL);
-	], [d_obtain_alias], [fs/dcache.c], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_D_OBTAIN_ALIAS, 1,
-		          [d_obtain_alias() is available])
-	], [
-		AC_MSG_RESULT(no)
-	])
-])

config/kernel-d-prune-aliases.m4

@@ -1,19 +0,0 @@
-dnl #
-dnl # 2.6.12 API change
-dnl # d_prune_aliases() helper function available.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_D_PRUNE_ALIASES],
-	[AC_MSG_CHECKING([whether d_prune_aliases() is available])
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
-		#include <linux/dcache.h>
-	], [
-		struct inode *ip = NULL;
-		d_prune_aliases(ip);
-	], [d_prune_aliases], [fs/dcache.c], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_D_PRUNE_ALIASES, 1,
-		          [d_prune_aliases() is available])
-	], [
-		AC_MSG_RESULT(no)
-	])
-])

config/kernel-declare-event-class.m4

@@ -2,13 +2,10 @@ dnl #
 dnl # Ensure the DECLARE_EVENT_CLASS macro is available to non-GPL modules.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_DECLARE_EVENT_CLASS], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-I\$(src)"
-
 	AC_MSG_CHECKING([whether DECLARE_EVENT_CLASS() is available])
 	ZFS_LINUX_TRY_COMPILE_HEADER([
 		#include <linux/module.h>
-		MODULE_LICENSE(ZFS_META_LICENSE);
+		MODULE_LICENSE("$ZFS_META_LICENSE");
 
 		#define CREATE_TRACE_POINTS
 		#include "conftest.h"
@@ -18,7 +15,7 @@ AC_DEFUN([ZFS_AC_KERNEL_DECLARE_EVENT_CLASS], [
 	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_DECLARE_EVENT_CLASS, 1,
-		          [DECLARE_EVENT_CLASS() is available])
+		    [DECLARE_EVENT_CLASS() is available])
 	],[
 		AC_MSG_RESULT(no)
 	],[
@@ -55,5 +52,4 @@ AC_DEFUN([ZFS_AC_KERNEL_DECLARE_EVENT_CLASS], [
 		#define TRACE_INCLUDE_FILE conftest
 		#include <trace/define_trace.h>
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-dentry-operations.m4

@@ -1,9 +1,103 @@
+dnl #
+dnl # 3.4.0 API change
+dnl # Added d_make_root() to replace previous d_alloc_root() function.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_D_MAKE_ROOT], [
+	ZFS_LINUX_TEST_SRC([d_make_root], [
+		#include <linux/dcache.h>
+	], [
+		d_make_root(NULL);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_D_MAKE_ROOT], [
+	AC_MSG_CHECKING([whether d_make_root() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([d_make_root],
+	    [d_make_root], [fs/dcache.c], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_D_MAKE_ROOT, 1, [d_make_root() is available])
+	], [
+		AC_MSG_RESULT(no)
+	])
+])
+
+dnl #
+dnl # 2.6.28 API change
+dnl # Added d_obtain_alias() helper function.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_D_OBTAIN_ALIAS], [
+	ZFS_LINUX_TEST_SRC([d_obtain_alias], [
+		#include <linux/dcache.h>
+	], [
+		d_obtain_alias(NULL);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_D_OBTAIN_ALIAS], [
+	AC_MSG_CHECKING([whether d_obtain_alias() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([d_obtain_alias],
+	    [d_obtain_alias], [fs/dcache.c], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_D_OBTAIN_ALIAS, 1,
+		          [d_obtain_alias() is available])
+	], [
+		AC_MSG_RESULT(no)
+	])
+])
+
+dnl #
+dnl # 2.6.12 API change
+dnl # d_prune_aliases() helper function available.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_D_PRUNE_ALIASES], [
+	ZFS_LINUX_TEST_SRC([d_prune_aliases], [
+		#include <linux/dcache.h>
+	], [
+		struct inode *ip = NULL;
+		d_prune_aliases(ip);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_D_PRUNE_ALIASES], [
+	AC_MSG_CHECKING([whether d_prune_aliases() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([d_prune_aliases],
+	    [d_prune_aliases], [fs/dcache.c], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_D_PRUNE_ALIASES, 1,
+		    [d_prune_aliases() is available])
+	], [
+		AC_MSG_RESULT(no)
+	])
+])
+
+dnl #
+dnl # 2.6.38 API change
+dnl # Added d_set_d_op() helper function.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_D_SET_D_OP], [
+	ZFS_LINUX_TEST_SRC([d_set_d_op], [
+		#include <linux/dcache.h>
+	], [
+		d_set_d_op(NULL, NULL);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_D_SET_D_OP], [
+	AC_MSG_CHECKING([whether d_set_d_op() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([d_set_d_op],
+	    [d_set_d_op], [fs/dcache.c], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_D_SET_D_OP, 1, [d_set_d_op() is available])
+	], [
+		AC_MSG_RESULT(no)
+	])
+])
+
 dnl #
 dnl # 3.6 API change
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_D_REVALIDATE_NAMEIDATA], [
-	AC_MSG_CHECKING([whether dops->d_revalidate() takes struct nameidata])
+	ZFS_LINUX_TEST_SRC([dentry_operations_revalidate], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/dcache.h>
 		#include <linux/sched.h>
 
@@ -14,11 +108,15 @@ AC_DEFUN([ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA], [
 		    dops __attribute__ ((unused)) = {
 			.d_revalidate	= revalidate,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA], [
+	AC_MSG_CHECKING([whether dops->d_revalidate() takes struct nameidata])
+	ZFS_LINUX_TEST_RESULT([dentry_operations_revalidate], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_D_REVALIDATE_NAMEIDATA, 1,
-		          [dops->d_revalidate() operation takes nameidata])
+		    [dops->d_revalidate() operation takes nameidata])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -28,9 +126,8 @@ dnl #
 dnl # 2.6.30 API change
 dnl # The 'struct dentry_operations' was constified in the dentry structure.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CONST_DENTRY_OPERATIONS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CONST_DENTRY_OPERATIONS], [
-	AC_MSG_CHECKING([whether dentry uses const struct dentry_operations])
+	ZFS_LINUX_TEST_SRC([dentry_operations_const], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/dcache.h>
 
 		const struct dentry_operations test_d_op = {
@@ -38,32 +135,17 @@ AC_DEFUN([ZFS_AC_KERNEL_CONST_DENTRY_OPERATIONS], [
 		};
 	],[
 		struct dentry d __attribute__ ((unused));
-
 		d.d_op = &test_d_op;
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_CONST_DENTRY_OPERATIONS, 1,
-		          [dentry uses const struct dentry_operations])
-	],[
-		AC_MSG_RESULT(no)
 	])
 ])
 
-dnl #
+AC_DEFUN([ZFS_AC_KERNEL_CONST_DENTRY_OPERATIONS], [
-dnl # 2.6.38 API change
+	AC_MSG_CHECKING([whether dentry uses const struct dentry_operations])
-dnl # Added d_set_d_op() helper function.
+	ZFS_LINUX_TEST_RESULT([dentry_operations_const], [
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_D_SET_D_OP],
-	[AC_MSG_CHECKING([whether d_set_d_op() is available])
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
-		#include <linux/dcache.h>
-	], [
-		d_set_d_op(NULL, NULL);
-	], [d_set_d_op], [fs/dcache.c], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_D_SET_D_OP, 1,
+		AC_DEFINE(HAVE_CONST_DENTRY_OPERATIONS, 1,
-		          [d_set_d_op() is available])
+		    [dentry uses const struct dentry_operations])
-	], [
+	],[
 		AC_MSG_RESULT(no)
 	])
 ])
@@ -72,17 +154,41 @@ dnl #
 dnl # 2.6.38 API change
 dnl # Added sb->s_d_op default dentry_operations member
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_S_D_OP],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_S_D_OP], [
-	[AC_MSG_CHECKING([whether super_block has s_d_op])
+	ZFS_LINUX_TEST_SRC([super_block_s_d_op], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct super_block sb __attribute__ ((unused));
 		sb.s_d_op = NULL;
-	], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_S_D_OP], [
+	AC_MSG_CHECKING([whether super_block has s_d_op])
+	ZFS_LINUX_TEST_RESULT([super_block_s_d_op], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_S_D_OP, 1, [struct super_block has s_d_op])
 	], [
 		AC_MSG_RESULT(no)
 	])
 ])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_DENTRY], [
+        ZFS_AC_KERNEL_SRC_D_MAKE_ROOT
+        ZFS_AC_KERNEL_SRC_D_OBTAIN_ALIAS
+        ZFS_AC_KERNEL_SRC_D_PRUNE_ALIASES
+        ZFS_AC_KERNEL_SRC_D_SET_D_OP
+        ZFS_AC_KERNEL_SRC_D_REVALIDATE_NAMEIDATA
+        ZFS_AC_KERNEL_SRC_CONST_DENTRY_OPERATIONS
+        ZFS_AC_KERNEL_SRC_S_D_OP
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_DENTRY], [
+        ZFS_AC_KERNEL_D_MAKE_ROOT
+        ZFS_AC_KERNEL_D_OBTAIN_ALIAS
+        ZFS_AC_KERNEL_D_PRUNE_ALIASES
+        ZFS_AC_KERNEL_D_SET_D_OP
+        ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA
+        ZFS_AC_KERNEL_CONST_DENTRY_OPERATIONS
+        ZFS_AC_KERNEL_S_D_OP
+])

config/kernel-dirty-inode.m4

@@ -4,9 +4,8 @@ dnl # The sops->dirty_inode() callbacks were updated to take a flags
 dnl # argument.  This allows the greater control over whether the
 dnl # filesystem needs to push out a transaction or not.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_DIRTY_INODE_WITH_FLAGS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_DIRTY_INODE], [
-	AC_MSG_CHECKING([whether sops->dirty_inode() wants flags])
+	ZFS_LINUX_TEST_SRC([dirty_inode_with_flags], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		void dirty_inode(struct inode *a, int b) { return; }
@@ -15,11 +14,15 @@ AC_DEFUN([ZFS_AC_KERNEL_DIRTY_INODE_WITH_FLAGS], [
 		    sops __attribute__ ((unused)) = {
 			.dirty_inode = dirty_inode,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_DIRTY_INODE], [
+	AC_MSG_CHECKING([whether sops->dirty_inode() wants flags])
+	ZFS_LINUX_TEST_RESULT([dirty_inode_with_flags], [
 		AC_MSG_RESULT([yes])
 		AC_DEFINE(HAVE_DIRTY_INODE_WITH_FLAGS, 1,
-			[sops->dirty_inode() wants flags])
+		    [sops->dirty_inode() wants flags])
 	],[
 		AC_MSG_RESULT([no])
 	])

config/kernel-discard-granularity.m4

@@ -2,18 +2,21 @@ dnl #
 dnl # 2.6.33 API change
 dnl # Discard granularity and alignment restrictions may now be set.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_DISCARD_GRANULARITY], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_DISCARD_GRANULARITY], [
-	AC_MSG_CHECKING([whether ql->discard_granularity is available])
+	ZFS_LINUX_TEST_SRC([discard_granularity], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
 		struct queue_limits ql __attribute__ ((unused));
-
 		ql.discard_granularity = 0;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_DISCARD_GRANULARITY], [
+	AC_MSG_CHECKING([whether ql->discard_granularity is available])
+	ZFS_LINUX_TEST_RESULT([discard_granularity], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_DISCARD_GRANULARITY, 1,
-		          [ql->discard_granularity is available])
+		    [ql->discard_granularity is available])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-elevator-change.m4

@@ -2,24 +2,25 @@ dnl #
 dnl # 2.6.36 API, exported elevator_change() symbol
 dnl # 4.12 API, removed elevator_change() symbol
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_ELEVATOR_CHANGE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_ELEVATOR_CHANGE], [
-	AC_MSG_CHECKING([whether elevator_change() is available])
+	ZFS_LINUX_TEST_SRC([elevator_change], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 		#include <linux/elevator.h>
 	],[
-		int ret;
 		struct request_queue *q = NULL;
 		char *elevator = NULL;
-		ret = elevator_change(q, elevator);
+		int error __attribute__ ((unused)) =
-	],[
+		    elevator_change(q, elevator);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_ELEVATOR_CHANGE], [
+	AC_MSG_CHECKING([whether elevator_change() is available])
+	ZFS_LINUX_TEST_RESULT([elevator_change], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_ELEVATOR_CHANGE, 1,
-			  [elevator_change() is available])
+		    [elevator_change() is available])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-encode-fh-inode.m4

@@ -4,20 +4,23 @@ dnl # torvalds/linux@b0b0382bb4904965a9e9fca77ad87514dfda0d1c changed the
 dnl # ->encode_fh() callback to pass the child inode and its parents inode
 dnl # rather than a dentry and a boolean saying whether we want the parent.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_ENCODE_FH_WITH_INODE], [
-	AC_MSG_CHECKING([whether eops->encode_fh() wants inode])
+	ZFS_LINUX_TEST_SRC([export_operations_encode_fh], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/exportfs.h>
 		int encode_fh(struct inode *inode, __u32 *fh, int *max_len,
 		              struct inode *parent) { return 0; }
 		static struct export_operations eops __attribute__ ((unused))={
 			.encode_fh = encode_fh,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE], [
+	AC_MSG_CHECKING([whether eops->encode_fh() wants inode])
+	ZFS_LINUX_TEST_RESULT([export_operations_encode_fh], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_ENCODE_FH_WITH_INODE, 1,
-		          [eops->encode_fh() wants child and parent inodes])
+		    [eops->encode_fh() wants child and parent inodes])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-evict-inode.m4

@@ -3,16 +3,19 @@ dnl # 2.6.36 API change
 dnl # The sops->delete_inode() and sops->clear_inode() callbacks have
 dnl # replaced by a single sops->evict_inode() callback.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_EVICT_INODE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_EVICT_INODE], [
-	AC_MSG_CHECKING([whether sops->evict_inode() exists])
+	ZFS_LINUX_TEST_SRC([evict_inode], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		void evict_inode (struct inode * t) { return; }
 		static struct super_operations sops __attribute__ ((unused)) = {
 			.evict_inode = evict_inode,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_EVICT_INODE], [
+	AC_MSG_CHECKING([whether sops->evict_inode() exists])
+	ZFS_LINUX_TEST_RESULT([evict_inode], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_EVICT_INODE, 1, [sops->evict_inode() exists])
 	],[

config/kernel-fallocate-pax.m4

@@ -1,19 +0,0 @@
-dnl #
-dnl # PaX Linux 2.6.38 - 3.x API
-dnl #
-AC_DEFUN([ZFS_AC_PAX_KERNEL_FILE_FALLOCATE], [
-	AC_MSG_CHECKING([whether fops->fallocate() exists])
-	ZFS_LINUX_TRY_COMPILE([
-		#include <linux/fs.h>
-	],[
-		long (*fallocate) (struct file *, int, loff_t, loff_t) = NULL;
-		struct file_operations_no_const fops __attribute__ ((unused)) = {
-			.fallocate = fallocate,
-		};
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])

config/kernel-fallocate.m4

@@ -1,9 +1,11 @@
 dnl #
-dnl # Linux 2.6.38 - 3.x API
+dnl # The fallocate callback was moved from the inode_operations
+dnl # structure to the file_operations structure.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FILE_FALLOCATE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [
-	AC_MSG_CHECKING([whether fops->fallocate() exists])
+
-	ZFS_LINUX_TRY_COMPILE([
+	dnl # Linux 2.6.38 - 3.x API
+	ZFS_LINUX_TEST_SRC([file_fallocate], [
 		#include <linux/fs.h>
 
 		long test_fallocate(struct file *file, int mode,
@@ -13,21 +15,10 @@ AC_DEFUN([ZFS_AC_KERNEL_FILE_FALLOCATE], [
 		    fops __attribute__ ((unused)) = {
 			.fallocate = test_fallocate,
 		};
-	],[
+	], [])
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
 
-dnl #
+	dnl # Linux 2.6.x - 2.6.37 API
-dnl # Linux 2.6.x - 2.6.37 API
+	ZFS_LINUX_TEST_SRC([inode_fallocate], [
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_FALLOCATE], [
-	AC_MSG_CHECKING([whether iops->fallocate() exists])
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		long test_fallocate(struct inode *inode, int mode,
@@ -37,20 +28,23 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_FALLOCATE], [
 		    fops __attribute__ ((unused)) = {
 			.fallocate = test_fallocate,
 		};
+	], [])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [
+	AC_MSG_CHECKING([whether fops->fallocate() exists])
+	ZFS_LINUX_TEST_RESULT([file_fallocate], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
 	],[
-	],[
+		AC_MSG_RESULT(no)
+	])
+
+	AC_MSG_CHECKING([whether iops->fallocate() exists])
+	ZFS_LINUX_TEST_RESULT([inode_fallocate], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_INODE_FALLOCATE, 1, [fops->fallocate() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
-
-dnl #
-dnl # The fallocate callback was moved from the inode_operations
-dnl # structure to the file_operations structure.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [
-	ZFS_AC_KERNEL_FILE_FALLOCATE
-	ZFS_AC_KERNEL_INODE_FALLOCATE
-])

config/kernel-file-dentry.m4

@@ -4,14 +4,18 @@ dnl # struct access file->f_path.dentry was replaced by accessor function
 dnl # since fix torvalds/linux@4bacc9c9234c ("overlayfs: Make f_path always
 dnl # point to the overlay and f_inode to the underlay").
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FILE_DENTRY], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FILE_DENTRY], [
-	AC_MSG_CHECKING([whether file_dentry() is available])
+	ZFS_LINUX_TEST_SRC([file_dentry], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct file *f = NULL;
 		file_dentry(f);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FILE_DENTRY], [
+	AC_MSG_CHECKING([whether file_dentry() is available])
+	ZFS_LINUX_TEST_RESULT([file_dentry], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_FILE_DENTRY, 1, [file_dentry() is available])
 	],[

config/kernel-file-inode.m4

@@ -3,14 +3,18 @@ dnl # 3.19 API change
 dnl # struct access f->f_dentry->d_inode was replaced by accessor function
 dnl # file_inode(f)
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FILE_INODE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FILE_INODE], [
-	AC_MSG_CHECKING([whether file_inode() is available])
+	ZFS_LINUX_TEST_SRC([file_inode], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct file *f = NULL;
 		file_inode(f);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FILE_INODE], [
+	AC_MSG_CHECKING([whether file_inode() is available])
+	ZFS_LINUX_TEST_RESULT([file_inode], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_FILE_INODE, 1, [file_inode() is available])
 	],[

config/kernel-fmode-t.m4

@@ -2,16 +2,19 @@ dnl #
 dnl # 2.6.28 API change,
 dnl # check if fmode_t typedef is defined
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_TYPE_FMODE_T],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FMODE_T], [
-	[AC_MSG_CHECKING([whether kernel defines fmode_t])
+	ZFS_LINUX_TEST_SRC([type_fmode_t], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/types.h>
 	],[
 		fmode_t *ptr __attribute__ ((unused));
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FMODE_T], [
+	AC_MSG_CHECKING([whether kernel defines fmode_t])
+	ZFS_LINUX_TEST_RESULT([type_fmode_t], [
 		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_FMODE_T, 1,
+		AC_DEFINE(HAVE_FMODE_T, 1, [kernel defines fmode_t])
-		          [kernel defines fmode_t])
 	],[
 		AC_MSG_RESULT([no])
 	])

config/kernel-follow-down-one.m4

@@ -3,14 +3,18 @@ dnl # 2.6.38 API change
 dnl # follow_down() renamed follow_down_one().  The original follow_down()
 dnl # symbol still exists but will traverse down all the layers.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_DOWN_ONE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FOLLOW_DOWN_ONE], [
-	AC_MSG_CHECKING([whether follow_down_one() is available])
+	ZFS_LINUX_TEST_SRC([follow_down_one], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/namei.h>
 	],[
 		struct path *p = NULL;
 		follow_down_one(p);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_DOWN_ONE], [
+	AC_MSG_CHECKING([whether follow_down_one() is available])
+	ZFS_LINUX_TEST_RESULT([follow_down_one], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_FOLLOW_DOWN_ONE, 1,
 		    [follow_down_one() is available])

config/kernel-fpu.m4

@@ -12,11 +12,10 @@ dnl #
 dnl # Pre-4.2:	Use kernel_fpu_{begin,end}()
 dnl #		HAVE_KERNEL_FPU & KERNEL_EXPORTS_X86_FPU
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FPU], [
+dnl # N.B. The header check is performed before all other checks since it
-	dnl #
+dnl # depends on HAVE_KERNEL_FPU_API_HEADER being set in confdefs.h.
-	dnl # N.B. The header check is performed before all other checks since
+dnl #
-	dnl # it depends on HAVE_KERNEL_FPU_API_HEADER being set in confdefs.h.
+AC_DEFUN([ZFS_AC_KERNEL_FPU_HEADER], [
-	dnl #
 	AC_MSG_CHECKING([whether fpu headers are available])
 	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/module.h>
@@ -29,13 +28,10 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
 	],[
 		AC_MSG_RESULT(i387.h & xcr.h)
 	])
+])
 
-	dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
-	dnl # Legacy kernel
+	ZFS_LINUX_TEST_SRC([kernel_fpu], [
-	dnl #
-	AC_MSG_CHECKING([whether kernel fpu is available])
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
-		#include <linux/module.h>
 		#include <linux/types.h>
 		#ifdef HAVE_KERNEL_FPU_API_HEADER
 		#include <asm/fpu/api.h>
@@ -43,11 +39,68 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
 		#include <asm/i387.h>
 		#include <asm/xcr.h>
 		#endif
-		MODULE_LICENSE("$ZFS_META_LICENSE");
+	], [
-	],[
 		kernel_fpu_begin();
 		kernel_fpu_end();
-	], [kernel_fpu_begin], [arch/x86/kernel/fpu/core.c], [
+	], [], [$ZFS_META_LICENSE])
+
+	ZFS_LINUX_TEST_SRC([__kernel_fpu], [
+		#include <linux/types.h>
+		#ifdef HAVE_KERNEL_FPU_API_HEADER
+		#include <asm/fpu/api.h>
+		#else
+		#include <asm/i387.h>
+		#include <asm/xcr.h>
+		#endif
+	], [
+		__kernel_fpu_begin();
+		__kernel_fpu_end();
+	], [], [$ZFS_META_LICENSE])
+
+	ZFS_LINUX_TEST_SRC([fpu_internal], [
+		#if defined(__x86_64) || defined(__x86_64__) || \
+		    defined(__i386) || defined(__i386__)
+		#if !defined(__x86)
+		#define __x86
+		#endif
+		#endif
+
+		#if !defined(__x86)
+		#error Unsupported architecture
+		#endif
+
+		#include <linux/types.h>
+		#ifdef HAVE_KERNEL_FPU_API_HEADER
+		#include <asm/fpu/api.h>
+		#include <asm/fpu/internal.h>
+		#else
+		#include <asm/i387.h>
+		#include <asm/xcr.h>
+		#endif
+
+		#if !defined(XSTATE_XSAVE)
+		#error XSTATE_XSAVE not defined
+		#endif
+
+		#if !defined(XSTATE_XRESTORE)
+		#error XSTATE_XRESTORE not defined
+		#endif
+	],[
+		struct fpu *fpu = &current->thread.fpu;
+		union fpregs_state *st = &fpu->state;
+		struct fregs_state *fr __attribute__ ((unused)) = &st->fsave;
+		struct fxregs_state *fxr __attribute__ ((unused)) = &st->fxsave;
+		struct xregs_state *xr __attribute__ ((unused)) = &st->xsave;
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FPU], [
+	dnl #
+	dnl # Legacy kernel
+	dnl #
+	AC_MSG_CHECKING([whether kernel fpu is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([kernel_fpu_license],
+	    [kernel_fpu_begin], [arch/x86/kernel/fpu/core.c], [
 		AC_MSG_RESULT(kernel_fpu_*)
 		AC_DEFINE(HAVE_KERNEL_FPU, 1,
 		    [kernel has kernel_fpu_* functions])
@@ -57,67 +110,16 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
 		dnl #
 		dnl # Linux 4.2 kernel
 		dnl #
-		ZFS_LINUX_TRY_COMPILE_SYMBOL([
+		ZFS_LINUX_TEST_RESULT_SYMBOL([__kernel_fpu_license],
-			#include <linux/module.h>
+		    [__kernel_fpu_begin],
-			#include <linux/types.h>
+		    [arch/x86/kernel/fpu/core.c arch/x86/kernel/i387.c], [
-			#ifdef HAVE_KERNEL_FPU_API_HEADER
-			#include <asm/fpu/api.h>
-			#else
-			#include <asm/i387.h>
-			#include <asm/xcr.h>
-			#endif
-			MODULE_LICENSE("$ZFS_META_LICENSE");
-		],[
-			__kernel_fpu_begin();
-			__kernel_fpu_end();
-		], [__kernel_fpu_begin],
-		[arch/x86/kernel/fpu/core.c arch/x86/kernel/i387.c], [
 			AC_MSG_RESULT(__kernel_fpu_*)
 			AC_DEFINE(HAVE_UNDERSCORE_KERNEL_FPU, 1,
 			    [kernel has __kernel_fpu_* functions])
 			AC_DEFINE(KERNEL_EXPORTS_X86_FPU, 1,
 			    [kernel exports FPU functions])
 		],[
-			ZFS_LINUX_TRY_COMPILE([
+			ZFS_LINUX_TEST_RESULT([fpu_internal], [
-				#include <linux/module.h>
-
-				#if defined(__x86_64) || defined(__x86_64__) || \
-				    defined(__i386) || defined(__i386__)
-				#if !defined(__x86)
-				#define __x86
-				#endif
-				#endif
-
-				#if !defined(__x86)
-				#error Unsupported architecture
-				#endif
-
-				#include <linux/types.h>
-				#ifdef HAVE_KERNEL_FPU_API_HEADER
-				#include <asm/fpu/api.h>
-				#include <asm/fpu/internal.h>
-				#else
-				#include <asm/i387.h>
-				#include <asm/xcr.h>
-				#endif
-
-				#if !defined(XSTATE_XSAVE)
-				#error XSTATE_XSAVE not defined
-				#endif
-
-				#if !defined(XSTATE_XRESTORE)
-				#error XSTATE_XRESTORE not defined
-				#endif
-			],[
-				struct fpu *fpu = &current->thread.fpu;
-				union fpregs_state *st = &fpu->state;
-				struct fregs_state *fr __attribute__ ((unused)) =
-				    &st->fsave;
-				struct fxregs_state *fxr __attribute__ ((unused)) =
-				    &st->fxsave;
-				struct xregs_state *xr __attribute__ ((unused)) =
-				    &st->xsave;
-			], [
 				AC_MSG_RESULT(internal)
 				AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL, 1,
 				    [kernel fpu internal])

config/kernel-fst-mount.m4

@@ -3,9 +3,8 @@ dnl # 2.6.38 API change
 dnl # The .get_sb callback has been replaced by a .mount callback
 dnl # in the file_system_type structure.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FST_MOUNT], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FST_MOUNT], [
-        AC_MSG_CHECKING([whether fst->mount() exists])
+        ZFS_LINUX_TEST_SRC([file_system_type_mount], [
-        ZFS_LINUX_TRY_COMPILE([
                 #include <linux/fs.h>
 
                 static struct dentry *
@@ -18,8 +17,12 @@ AC_DEFUN([ZFS_AC_KERNEL_FST_MOUNT], [
                 static struct file_system_type fst __attribute__ ((unused)) = {
                         .mount = mount,
                 };
-        ],[
+        ],[])
-        ],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FST_MOUNT], [
+        AC_MSG_CHECKING([whether fst->mount() exists])
+        ZFS_LINUX_TEST_RESULT([file_system_type_mount], [
                 AC_MSG_RESULT(yes)
                 AC_DEFINE(HAVE_FST_MOUNT, 1, [fst->mount() exists])
         ],[

config/kernel-fsync.m4

@@ -1,8 +1,8 @@
 dnl #
-dnl # Linux 2.6.x - 2.6.34 API
+dnl # Check file_operations->fsync interface.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FSYNC_WITH_DENTRY], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FSYNC], [
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_SRC([fsync_with_dentry], [
 		#include <linux/fs.h>
 
 		int test_fsync(struct file *f, struct dentry *dentry, int x)
@@ -12,20 +12,9 @@ AC_DEFUN([ZFS_AC_KERNEL_FSYNC_WITH_DENTRY], [
 		    fops __attribute__ ((unused)) = {
 			.fsync = test_fsync,
 		};
-	],[
+	],[])
-	],[
-		AC_MSG_RESULT([dentry])
-		AC_DEFINE(HAVE_FSYNC_WITH_DENTRY, 1,
-			[fops->fsync() with dentry])
-	],[
-	])
-])
 
-dnl #
+	ZFS_LINUX_TEST_SRC([fsync_without_dentry], [
-dnl # Linux 2.6.35 - Linux 3.0 API
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FSYNC_WITHOUT_DENTRY], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int test_fsync(struct file *f, int x) { return 0; }
@@ -34,20 +23,9 @@ AC_DEFUN([ZFS_AC_KERNEL_FSYNC_WITHOUT_DENTRY], [
 		    fops __attribute__ ((unused)) = {
 			.fsync = test_fsync,
 		};
-	],[
+	],[])
-	],[
-		AC_MSG_RESULT([no dentry])
-		AC_DEFINE(HAVE_FSYNC_WITHOUT_DENTRY, 1,
-			[fops->fsync() without dentry])
-	],[
-	])
-])
 
-dnl #
+	ZFS_LINUX_TEST_SRC([fsync_range], [
-dnl # Linux 3.1 - 3.x API
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FSYNC_RANGE], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int test_fsync(struct file *f, loff_t a, loff_t b, int c)
@@ -57,18 +35,43 @@ AC_DEFUN([ZFS_AC_KERNEL_FSYNC_RANGE], [
 		    fops __attribute__ ((unused)) = {
 			.fsync = test_fsync,
 		};
-	],[
+	],[])
-	],[
-		AC_MSG_RESULT([range])
-		AC_DEFINE(HAVE_FSYNC_RANGE, 1,
-			[fops->fsync() with range])
-	],[
-	])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_FSYNC], [
-	AC_MSG_CHECKING([whether fops->fsync() wants])
+	dnl #
-	ZFS_AC_KERNEL_FSYNC_WITH_DENTRY
+	dnl # Linux 2.6.x - 2.6.34 API
-	ZFS_AC_KERNEL_FSYNC_WITHOUT_DENTRY
+	dnl #
-	ZFS_AC_KERNEL_FSYNC_RANGE
+	AC_MSG_CHECKING([whether fops->fsync() wants dentry])
+	ZFS_LINUX_TEST_RESULT([fsync_with_dentry], [
+		AC_MSG_RESULT([yes])
+		AC_DEFINE(HAVE_FSYNC_WITH_DENTRY, 1,
+		    [fops->fsync() with dentry])
+	],[
+		AC_MSG_RESULT([no])
+
+		dnl #
+		dnl # Linux 2.6.35 - Linux 3.0 API
+		dnl #
+		AC_MSG_CHECKING([whether fops->fsync() wants no dentry])
+		ZFS_LINUX_TEST_RESULT([fsync_without_dentry], [
+			AC_MSG_RESULT([yes])
+			AC_DEFINE(HAVE_FSYNC_WITHOUT_DENTRY, 1,
+			    [fops->fsync() without dentry])
+		],[
+			AC_MSG_RESULT([no])
+
+			dnl #
+			dnl # Linux 3.1 - 3.x API
+			dnl #
+			AC_MSG_CHECKING([whether fops->fsync() wants range])
+			ZFS_LINUX_TEST_RESULT([fsync_range], [
+				AC_MSG_RESULT([range])
+				AC_DEFINE(HAVE_FSYNC_RANGE, 1,
+				    [fops->fsync() with range])
+			],[
+				ZFS_LINUX_TEST_ERROR([fops->fsync])
+			])
+		])
+	])
 ])

config/kernel-generic_io_acct.m4

@@ -1,12 +1,8 @@
 dnl #
-dnl # 3.19 API addition
+dnl # Check for generic io accounting interface.
 dnl #
-dnl # torvalds/linux@394ffa503bc40e32d7f54a9b817264e81ce131b4 allows us to
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
-dnl # increment iostat counters without generic_make_request().
+	ZFS_LINUX_TEST_SRC([generic_acct_3args], [
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT_3ARG], [
-	AC_MSG_CHECKING([whether 3 arg generic IO accounting symbols are available])
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/bio.h>
 
 		void (*generic_start_io_acct_f)(int, unsigned long,
@@ -16,24 +12,9 @@ AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT_3ARG], [
 	], [
 		generic_start_io_acct(0, 0, NULL);
 		generic_end_io_acct(0, NULL, 0);
-	], [generic_start_io_acct], [block/bio.c], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_GENERIC_IO_ACCT_3ARG, 1,
-		    [generic_start_io_acct()/generic_end_io_acct() available])
-	], [
-		AC_MSG_RESULT(no)
 	])
-])
 
-dnl #
+	ZFS_LINUX_TEST_SRC([generic_acct_4args], [
-dnl # Linux 4.14 API,
-dnl #
-dnl # generic_start_io_acct/generic_end_io_acct now require request_queue to be
-dnl # provided. No functional changes, but preparation for inflight accounting 
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT_4ARG], [
-	AC_MSG_CHECKING([whether 4 arg generic IO accounting symbols are available])
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/bio.h>
 
 		void (*generic_start_io_acct_f)(struct request_queue *, int,
@@ -43,11 +24,41 @@ AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT_4ARG], [
 	], [
 		generic_start_io_acct(NULL, 0, 0, NULL);
 		generic_end_io_acct(NULL, 0, NULL, 0);
-	], [generic_start_io_acct], [block/bio.c], [
+	])
-		AC_MSG_RESULT(yes)
+])
-		AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1,
+
-		    [generic_start_io_acct()/generic_end_io_acct() 4 arg available])
+AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT], [
-	], [
+	dnl #
-		AC_MSG_RESULT(no)
+	dnl # 3.19 API addition
+	dnl #
+	dnl # torvalds/linux@394ffa50 allows us to increment iostat
+	dnl # counters without generic_make_request().
+	dnl #
+	AC_MSG_CHECKING([whether generic IO accounting wants 3 args])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_3args],
+	    [generic_start_io_acct], [block/bio.c], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_GENERIC_IO_ACCT_3ARG, 1,
+		    [generic_start_io_acct()/generic_end_io_acct() available])
+	], [
+		AC_MSG_RESULT(no)
+
+		dnl #
+		dnl # Linux 4.14 API,
+		dnl #
+		dnl # generic_start_io_acct/generic_end_io_acct now require
+		dnl # request_queue to be provided. No functional changes,
+		dnl # but preparation for inflight accounting.
+		dnl #
+		AC_MSG_CHECKING([whether generic IO accounting wants 4 args])
+		ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_4args],
+		    [generic_start_io_acct], [block/bio.c], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1,
+			    [generic_start_io_acct()/generic_end_io_acct() ]
+			    [4 arg available])
+		], [
+			AC_MSG_RESULT(no)
+		])
 	])
 ])

config/kernel-generic_readlink.m4

@@ -4,18 +4,21 @@ dnl #
 dnl # NULL inode_operations.readlink implies generic_readlink(), which
 dnl # has been made static.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GENERIC_READLINK_GLOBAL], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_READLINK_GLOBAL], [
-	AC_MSG_CHECKING([whether generic_readlink is global])
+	ZFS_LINUX_TEST_SRC([generic_readlink_global], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		int i __attribute__ ((unused));
-
 		i = generic_readlink(NULL, NULL, 0);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_GENERIC_READLINK_GLOBAL], [
+	AC_MSG_CHECKING([whether generic_readlink is global])
+	ZFS_LINUX_TEST_RESULT([generic_readlink_global], [
 		AC_MSG_RESULT([yes])
 		AC_DEFINE(HAVE_GENERIC_READLINK, 1,
-		          [generic_readlink is global])
+		    [generic_readlink is global])
 	],[
 		AC_MSG_RESULT([no])
 	])

config/kernel-get-disk-and-module.m4

@@ -2,14 +2,19 @@ dnl #
 dnl # 4.16 API change
 dnl # Verify if get_disk_and_module() symbol is available.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GET_DISK_AND_MODULE],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_DISK_AND_MODULE], [
-	[AC_MSG_CHECKING([whether get_disk_and_module() is available])
+	ZFS_LINUX_TEST_SRC([get_disk_and_module], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/genhd.h>
 	], [
 		struct gendisk *disk = NULL;
 		(void) get_disk_and_module(disk);
-	], [get_disk_and_module], [block/genhd.c], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_GET_DISK_AND_MODULE], [
+	AC_MSG_CHECKING([whether get_disk_and_module() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([get_disk_and_module],
+	    [get_disk_and_module], [block/genhd.c], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_GET_DISK_AND_MODULE,
 		    1, [get_disk_and_module() is available])

config/kernel-get-disk-ro.m4

@@ -1,21 +1,21 @@
 dnl #
 dnl # 2.6.x API change
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GET_DISK_RO], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_DISK_RO], [
-	AC_MSG_CHECKING([whether get_disk_ro() is available])
+	ZFS_LINUX_TEST_SRC([get_disk_ro], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/blkdev.h>
 	],[
 		struct gendisk *disk = NULL;
 		(void) get_disk_ro(disk);
-	],[
+	], [$NO_UNUSED_BUT_SET_VARIABLE])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_GET_DISK_RO], [
+	AC_MSG_CHECKING([whether get_disk_ro() is available])
+	ZFS_LINUX_TEST_RESULT([get_disk_ro], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_GET_DISK_RO, 1,
+		AC_DEFINE(HAVE_GET_DISK_RO, 1, [blk_disk_ro() is available])
-		          [blk_disk_ro() is available])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-get-link.m4

@@ -1,13 +1,29 @@
 dnl #
 dnl # Supported get_link() interfaces checked newest to oldest.
+dnl # Note this interface used to be named follow_link.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_LINK], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_LINK], [
-	dnl #
+	ZFS_LINUX_TEST_SRC([inode_operations_get_link], [
-	dnl # 4.2 API change
+		#include <linux/fs.h>
-	dnl # - This kernel retired the nameidata structure.
+		const char *get_link(struct dentry *de, struct inode *ip,
-	dnl #
+		    struct delayed_call *done) { return "symlink"; }
-	AC_MSG_CHECKING([whether iops->follow_link() passes cookie])
+		static struct inode_operations
-	ZFS_LINUX_TRY_COMPILE([
+		     iops __attribute__ ((unused)) = {
+			.get_link = get_link,
+		};
+	],[])
+
+	ZFS_LINUX_TEST_SRC([inode_operations_get_link_cookie], [
+		#include <linux/fs.h>
+		const char *get_link(struct dentry *de, struct
+		    inode *ip, void **cookie) { return "symlink"; }
+		static struct inode_operations
+		     iops __attribute__ ((unused)) = {
+			.get_link = get_link,
+		};
+	],[])
+
+	ZFS_LINUX_TEST_SRC([inode_operations_follow_link], [
 		#include <linux/fs.h>
 		const char *follow_link(struct dentry *de,
 		    void **cookie) { return "symlink"; }
@@ -15,35 +31,17 @@ AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_LINK], [
 		    iops __attribute__ ((unused)) = {
 			.follow_link = follow_link,
 		};
-	],[
+	],[])
-	],[
+
-		AC_MSG_RESULT(yes)
+	ZFS_LINUX_TEST_SRC([inode_operations_follow_link_nameidata], [
-		AC_DEFINE(HAVE_FOLLOW_LINK_COOKIE, 1,
-		    [iops->follow_link() cookie])
-	],[
-		dnl #
-		dnl # 2.6.32 API
-		dnl #
-		AC_MSG_RESULT(no)
-		AC_MSG_CHECKING(
-		   [whether iops->follow_link() passes nameidata])
-		ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
-			void *follow_link(struct dentry *de, struct
+		void *follow_link(struct dentry *de, struct
-			    nameidata *nd) { return (void *)NULL; }
+		    nameidata *nd) { return (void *)NULL; }
-			static struct inode_operations
+		static struct inode_operations
-			    iops __attribute__ ((unused)) = {
+		    iops __attribute__ ((unused)) = {
-				.follow_link = follow_link,
+			.follow_link = follow_link,
-			};
+		};
-		],[
+	],[])
-		],[
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_FOLLOW_LINK_NAMEIDATA, 1,
-			          [iops->follow_link() nameidata])
-		],[
-			AC_MSG_ERROR(no; please file a bug report)
-		])
-	])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_GET_LINK], [
@@ -53,20 +51,12 @@ AC_DEFUN([ZFS_AC_KERNEL_GET_LINK], [
 	dnl # used it to retire the put_link() interface.
 	dnl #
 	AC_MSG_CHECKING([whether iops->get_link() passes delayed])
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([inode_operations_get_link], [
-		#include <linux/fs.h>
-		const char *get_link(struct dentry *de, struct inode *ip,
-		    struct delayed_call *done) { return "symlink"; }
-		static struct inode_operations
-		     iops __attribute__ ((unused)) = {
-			.get_link = get_link,
-		};
-	],[
-	],[
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_GET_LINK_DELAYED, 1,
+		AC_DEFINE(HAVE_GET_LINK_DELAYED, 1, [iops->get_link() delayed])
-		    [iops->get_link() delayed])
 	],[
+		AC_MSG_RESULT(no)
+
 		dnl #
 		dnl # 4.5 API change
 		dnl # The follow_link() interface has been replaced by
@@ -74,27 +64,41 @@ AC_DEFUN([ZFS_AC_KERNEL_GET_LINK], [
 		dnl # - An inode is passed as a separate argument
 		dnl # - When called in RCU mode a NULL dentry is passed.
 		dnl #
-		AC_MSG_RESULT(no)
 		AC_MSG_CHECKING([whether iops->get_link() passes cookie])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([inode_operations_get_link_cookie], [
-			#include <linux/fs.h>
-			const char *get_link(struct dentry *de, struct
-			    inode *ip, void **cookie) { return "symlink"; }
-			static struct inode_operations
-			     iops __attribute__ ((unused)) = {
-				.get_link = get_link,
-			};
-		],[
-		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_GET_LINK_COOKIE, 1,
 			    [iops->get_link() cookie])
 		],[
-			dnl #
-			dnl # Check for the follow_link APIs.
-			dnl #
 			AC_MSG_RESULT(no)
-			ZFS_AC_KERNEL_FOLLOW_LINK
+
+			dnl #
+			dnl # 4.2 API change
+			dnl # This kernel retired the nameidata structure.
+			dnl #
+			AC_MSG_CHECKING(
+			    [whether iops->follow_link() passes cookie])
+			ZFS_LINUX_TEST_RESULT([inode_operations_follow_link], [
+				AC_MSG_RESULT(yes)
+				AC_DEFINE(HAVE_FOLLOW_LINK_COOKIE, 1,
+				    [iops->follow_link() cookie])
+			],[
+				AC_MSG_RESULT(no)
+
+				dnl #
+				dnl # 2.6.32 API
+				dnl #
+				AC_MSG_CHECKING(
+				[whether iops->follow_link() passes nameidata])
+				ZFS_LINUX_TEST_RESULT(
+				    [inode_operations_follow_link_nameidata],[
+					AC_MSG_RESULT(yes)
+					AC_DEFINE(HAVE_FOLLOW_LINK_NAMEIDATA, 1,
+					    [iops->follow_link() nameidata])
+				],[
+					ZFS_LINUX_TEST_ERROR([get_link])
+				])
+			])
 		])
 	])
 ])

config/kernel-global_page_state.m4

@@ -4,16 +4,21 @@ dnl #
 dnl # 75ef71840539 mm, vmstat: add infrastructure for per-node vmstats
 dnl # 599d0c954f91 mm, vmscan: move LRU lists to node
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_NODE_PAGE_STATE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GLOBAL_NODE_PAGE_STATE], [
-	AC_MSG_CHECKING([whether global_node_page_state() exists])
+	ZFS_LINUX_TEST_SRC([global_node_page_state], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/mm.h>
 		#include <linux/vmstat.h>
 	],[
 		(void) global_node_page_state(0);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_NODE_PAGE_STATE], [
+	AC_MSG_CHECKING([whether global_node_page_state() exists])
+	ZFS_LINUX_TEST_RESULT([global_node_page_state], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(ZFS_GLOBAL_NODE_PAGE_STATE, 1, [global_node_page_state() exists])
+		AC_DEFINE(ZFS_GLOBAL_NODE_PAGE_STATE, 1,
+		    [global_node_page_state() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -24,16 +29,21 @@ dnl # 4.14 API change
 dnl #
 dnl # c41f012ade0b mm: rename global_page_state to global_zone_page_state
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GLOBAL_ZONE_PAGE_STATE], [
-	AC_MSG_CHECKING([whether global_zone_page_state() exists])
+	ZFS_LINUX_TEST_SRC([global_zone_page_state], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/mm.h>
 		#include <linux/vmstat.h>
 	],[
 		(void) global_zone_page_state(0);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE], [
+	AC_MSG_CHECKING([whether global_zone_page_state() exists])
+	ZFS_LINUX_TEST_RESULT([global_zone_page_state], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(ZFS_GLOBAL_ZONE_PAGE_STATE, 1, [global_zone_page_state() exists])
+		AC_DEFINE(ZFS_GLOBAL_ZONE_PAGE_STATE, 1,
+		    [global_zone_page_state() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -44,9 +54,11 @@ dnl # Create a define and autoconf variable for an enum member
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_ENUM_MEMBER], [
 	AC_MSG_CHECKING([whether enum $2 contains $1])
-	AS_IF([AC_TRY_COMMAND("${srcdir}/scripts/enum-extract.pl" "$2" "$3" | egrep -qx $1)],[
+	AS_IF([AC_TRY_COMMAND(
+	    "${srcdir}/scripts/enum-extract.pl" "$2" "$3" | egrep -qx $1)],[
 		AC_MSG_RESULT([yes])
-		AC_DEFINE(m4_join([_], [ZFS_ENUM], m4_toupper($2), $1), 1, [enum $2 contains $1])
+		AC_DEFINE(m4_join([_], [ZFS_ENUM], m4_toupper($2), $1), 1,
+		    [enum $2 contains $1])
 		m4_join([_], [ZFS_ENUM], m4_toupper($2), $1)=1
 	],[
 		AC_MSG_RESULT([no])
@@ -59,8 +71,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_ERROR],[
 	AC_MSG_RESULT(no)
 	AC_MSG_RESULT([$1 in either node_stat_item or zone_stat_item: $2])
-	AC_MSG_RESULT([configure needs updating, see: config/kernel-global_page_state.m4])
+	ZFS_LINUX_TEST_ERROR([global page state])
-	AC_MSG_FAILURE([SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD!])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK], [
@@ -75,10 +86,10 @@ AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK], [
 ])
 
 dnl #
-dnl # Ensure the config tests are finding one and only one of each enum of interest
+dnl # Ensure the config tests are finding one and only one of each enum.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY], [
-	AC_MSG_CHECKING([global_page_state enums are sane])
+	AC_MSG_CHECKING([whether global_page_state enums are sane])
 
 	ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_FILE_PAGES])
 	ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_ANON])
@@ -88,6 +99,11 @@ AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY], [
 	AC_MSG_RESULT(yes)
 ])
 
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GLOBAL_PAGE_STATE], [
+	ZFS_AC_KERNEL_SRC_GLOBAL_NODE_PAGE_STATE
+	ZFS_AC_KERNEL_SRC_GLOBAL_ZONE_PAGE_STATE
+])
+
 dnl #
 dnl # enum members in which we're interested
 dnl #
@@ -95,15 +111,23 @@ AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE], [
 	ZFS_AC_KERNEL_GLOBAL_NODE_PAGE_STATE
 	ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE
 
-	ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES],		[node_stat_item], [$LINUX/include/linux/mmzone.h])
+	ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES],
-	ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON],		[node_stat_item], [$LINUX/include/linux/mmzone.h])
+	    [node_stat_item], [$LINUX/include/linux/mmzone.h])
-	ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE],		[node_stat_item], [$LINUX/include/linux/mmzone.h])
+	ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON],
-	ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE],	[node_stat_item], [$LINUX/include/linux/mmzone.h])
+	    [node_stat_item], [$LINUX/include/linux/mmzone.h])
+	ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE],
+	    [node_stat_item], [$LINUX/include/linux/mmzone.h])
+	ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE],
+	    [node_stat_item], [$LINUX/include/linux/mmzone.h])
 
-	ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES],		[zone_stat_item], [$LINUX/include/linux/mmzone.h])
+	ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES],
-	ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON],		[zone_stat_item], [$LINUX/include/linux/mmzone.h])
+	    [zone_stat_item], [$LINUX/include/linux/mmzone.h])
-	ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE],		[zone_stat_item], [$LINUX/include/linux/mmzone.h])
+	ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON],
-	ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE],	[zone_stat_item], [$LINUX/include/linux/mmzone.h])
+	    [zone_stat_item], [$LINUX/include/linux/mmzone.h])
+	ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE],
+	    [zone_stat_item], [$LINUX/include/linux/mmzone.h])
+	ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE],
+	    [zone_stat_item], [$LINUX/include/linux/mmzone.h])
 
 	ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY
 ])

config/kernel-group-info.m4

@@ -2,20 +2,21 @@ dnl #
 dnl # 4.9 API change
 dnl # group_info changed from 2d array via >blocks to 1d array via ->gid
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_GROUP_INFO_GID], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_GROUP_INFO_GID], [
-	AC_MSG_CHECKING([whether group_info->gid exists])
+	ZFS_LINUX_TEST_SRC([group_info_gid], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/cred.h>
 	],[
 		struct group_info *gi = groups_alloc(1);
 		gi->gid[0] = KGIDT_INIT(0);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_GROUP_INFO_GID], [
+	AC_MSG_CHECKING([whether group_info->gid exists])
+	ZFS_LINUX_TEST_RESULT([group_info_gid], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_GROUP_INFO_GID, 1, [group_info->gid exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-in-compat-syscall.m4

@@ -4,13 +4,17 @@ dnl # Added in_compat_syscall() which can be overridden on a per-
 dnl # architecture basis.  Prior to this is_compat_task() was the
 dnl # provided interface.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_IN_COMPAT_SYSCALL], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_IN_COMPAT_SYSCALL], [
-	AC_MSG_CHECKING([whether in_compat_syscall() is available])
+	ZFS_LINUX_TEST_SRC([in_compat_syscall], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/compat.h>
 	],[
 		in_compat_syscall();
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_IN_COMPAT_SYSCALL], [
+	AC_MSG_CHECKING([whether in_compat_syscall() is available])
+	ZFS_LINUX_TEST_RESULT([in_compat_syscall], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_IN_COMPAT_SYSCALL, 1,
 		    [in_compat_syscall() is available])

config/kernel-inode-getattr.m4

@@ -2,9 +2,8 @@ dnl #
 dnl # Linux 4.11 API
 dnl # See torvalds/linux@a528d35
 dnl #
-AC_DEFUN([ZFS_AC_PATH_KERNEL_IOPS_GETATTR], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GETATTR], [
-	AC_MSG_CHECKING([whether iops->getattr() takes a path])
+	ZFS_LINUX_TEST_SRC([inode_operations_getattr_path], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int test_getattr(
@@ -16,24 +15,9 @@ AC_DEFUN([ZFS_AC_PATH_KERNEL_IOPS_GETATTR], [
 		    iops __attribute__ ((unused)) = {
 			.getattr = test_getattr,
 		};
-	],[
+	],[])
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_PATH_IOPS_GETATTR, 1,
-		    [iops->getattr() takes a path])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
 
-
+	ZFS_LINUX_TEST_SRC([inode_operations_getattr_vfsmount], [
-
-dnl #
-dnl # Linux 3.9 - 4.10 API
-dnl #
-AC_DEFUN([ZFS_AC_VFSMOUNT_KERNEL_IOPS_GETATTR], [
-	AC_MSG_CHECKING([whether iops->getattr() takes a vfsmount])
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int test_getattr(
@@ -45,23 +29,25 @@ AC_DEFUN([ZFS_AC_VFSMOUNT_KERNEL_IOPS_GETATTR], [
 		    iops __attribute__ ((unused)) = {
 			.getattr = test_getattr,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_GETATTR], [
+	AC_MSG_CHECKING([whether iops->getattr() takes a path])
+	ZFS_LINUX_TEST_RESULT([inode_operations_getattr_path], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_VFSMOUNT_IOPS_GETATTR, 1,
+		AC_DEFINE(HAVE_PATH_IOPS_GETATTR, 1,
-		    [iops->getattr() takes a vfsmount])
+		    [iops->getattr() takes a path])
 	],[
 		AC_MSG_RESULT(no)
+
+		AC_MSG_CHECKING([whether iops->getattr() takes a vfsmount])
+		ZFS_LINUX_TEST_RESULT([inode_operations_getattr_vfsmount], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_VFSMOUNT_IOPS_GETATTR, 1,
+			    [iops->getattr() takes a vfsmount])
+		],[
+			AC_MSG_RESULT(no)
+		])
 	])
 ])
-
-
-dnl #
-dnl # The interface of the getattr callback from the inode_operations
-dnl # structure changed.  Also, the interface of the simple_getattr()
-dnl # function provided by the kernel changed.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_GETATTR], [
-	ZFS_AC_PATH_KERNEL_IOPS_GETATTR
-	ZFS_AC_VFSMOUNT_KERNEL_IOPS_GETATTR
-])

config/kernel-inode-lock.m4

@@ -4,20 +4,21 @@ dnl # i_mutex is changed to i_rwsem. Instead of directly using
 dnl # i_mutex/i_rwsem, we should use inode_lock() and inode_lock_shared()
 dnl # We test inode_lock_shared because inode_lock is introduced earlier.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_LOCK], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_LOCK], [
-	AC_MSG_CHECKING([whether inode_lock_shared() exists])
+	ZFS_LINUX_TEST_SRC([inode_lock], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct inode *inode = NULL;
 		inode_lock_shared(inode);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_LOCK], [
+	AC_MSG_CHECKING([whether inode_lock_shared() exists])
+	ZFS_LINUX_TEST_RESULT([inode_lock], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_INODE_LOCK_SHARED, 1, [yes])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-inode-set-flags.m4

@@ -2,14 +2,18 @@ dnl #
 dnl # 3.15 API change
 dnl # inode_set_flags introduced to set i_flags
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_SET_FLAGS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_SET_FLAGS], [
-	AC_MSG_CHECKING([whether inode_set_flags() exists])
+	ZFS_LINUX_TEST_SRC([inode_set_flags], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct inode inode;
 		inode_set_flags(&inode, S_IMMUTABLE, S_IMMUTABLE);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_SET_FLAGS], [
+	AC_MSG_CHECKING([whether inode_set_flags() exists])
+	ZFS_LINUX_TEST_RESULT([inode_set_flags], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_INODE_SET_FLAGS, 1, [inode_set_flags() exists])
 	],[

config/kernel-inode-set-iversion.m4

@@ -2,14 +2,18 @@ dnl #
 dnl # 4.16 API change
 dnl # inode_set_iversion introduced to set i_version
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_SET_IVERSION], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_SET_IVERSION], [
-	AC_MSG_CHECKING([whether inode_set_iversion() exists])
+	ZFS_LINUX_TEST_SRC([inode_set_iversion], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/iversion.h>
 	],[
 		struct inode inode;
 		inode_set_iversion(&inode, 1);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_SET_IVERSION], [
+	AC_MSG_CHECKING([whether inode_set_iversion() exists])
+	ZFS_LINUX_TEST_RESULT([inode_set_iversion], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_INODE_SET_IVERSION, 1,
 		    [inode_set_iversion() exists])

config/kernel-inode-times.m4

@@ -2,11 +2,8 @@ dnl #
 dnl # 4.18 API change
 dnl # i_atime, i_mtime, and i_ctime changed from timespec to timespec64.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [
-	AC_MSG_CHECKING([whether inode->i_*time's are timespec64])
+	ZFS_LINUX_TEST_SRC([inode_times], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct inode ip;
@@ -14,12 +11,16 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [
 
 		memset(&ip, 0, sizeof(ip));
 		ts = ip.i_mtime;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [
+	AC_MSG_CHECKING([whether inode->i_*time's are timespec64])
+	ZFS_LINUX_TEST_RESULT([inode_times], [
 		AC_MSG_RESULT(no)
 	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_INODE_TIMESPEC64_TIMES, 1,
 		    [inode->i_*time's are timespec64])
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])

config/kernel-insert-inode-locked.m4

@@ -2,16 +2,21 @@ dnl #
 dnl # 2.6.28 API change
 dnl # Added insert_inode_locked() helper function.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INSERT_INODE_LOCKED],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INSERT_INODE_LOCKED], [
-	[AC_MSG_CHECKING([whether insert_inode_locked() is available])
+	ZFS_LINUX_TEST_SRC([insert_inode_locked], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 	], [
 		insert_inode_locked(NULL);
-	], [insert_inode_locked], [fs/inode.c], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INSERT_INODE_LOCKED], [
+	AC_MSG_CHECKING([whether insert_inode_locked() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([insert_inode_locked],
+	    [insert_inode_locked], [fs/inode.c], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_INSERT_INODE_LOCKED, 1,
-		          [insert_inode_locked() is available])
+		    [insert_inode_locked() is available])
 	], [
 		AC_MSG_RESULT(no)
 	])

config/kernel-invalidate-bdev-args.m4

@@ -2,17 +2,21 @@ dnl #
 dnl # 2.6.22 API change
 dnl # Unused destroy_dirty_buffers arg removed from prototype.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INVALIDATE_BDEV], [
-	AC_MSG_CHECKING([whether invalidate_bdev() wants 1 arg])
+	ZFS_LINUX_TEST_SRC([invalidate_bdev], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/buffer_head.h>
 	],[
 		struct block_device *bdev = NULL;
 		invalidate_bdev(bdev);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INVALIDATE_BDEV], [
+	AC_MSG_CHECKING([whether invalidate_bdev() wants 1 arg])
+	ZFS_LINUX_TEST_RESULT([invalidate_bdev], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_1ARG_INVALIDATE_BDEV, 1,
-		          [invalidate_bdev() wants 1 arg])
+		    [invalidate_bdev() wants 1 arg])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-is_owner_or_cap.m4

@@ -4,33 +4,40 @@ dnl # The is_owner_or_cap() macro was renamed to inode_owner_or_capable(),
 dnl # This is used for permission checks in the xattr and file attribute call
 dnl # paths.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_INODE_OWNER_OR_CAPABLE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OWNER_OR_CAPABLE], [
-	AC_MSG_CHECKING([whether inode_owner_or_capable() exists])
+	ZFS_LINUX_TEST_SRC([inode_owner_or_capable], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct inode *ip = NULL;
 		(void) inode_owner_or_capable(ip);
+	])
+
+
+	ZFS_LINUX_TEST_SRC([is_owner_or_cap], [
+		#include <linux/fs.h>
+		#include <linux/sched.h>
 	],[
+		struct inode *ip = NULL;
+		(void) is_owner_or_cap(ip);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_INODE_OWNER_OR_CAPABLE], [
+	AC_MSG_CHECKING([whether inode_owner_or_capable() exists])
+	ZFS_LINUX_TEST_RESULT([inode_owner_or_capable], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_INODE_OWNER_OR_CAPABLE, 1,
 		    [inode_owner_or_capable() exists])
 	],[
 		AC_MSG_RESULT(no)
 		AC_MSG_CHECKING([whether is_owner_or_cap() exists])
-		ZFS_LINUX_TRY_COMPILE([
+
-			#include <linux/fs.h>
+		ZFS_LINUX_TEST_RESULT([is_owner_or_cap], [
-			#include <linux/sched.h>
-		],[
-			struct inode *ip = NULL;
-			(void) is_owner_or_cap(ip);
-		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_IS_OWNER_OR_CAP, 1,
 			    [is_owner_or_cap() exists])
 		],[
-			AC_MSG_ERROR(no - Please file a bug report at
+			ZFS_LINUX_TEST_ERROR([capability])
-			    https://github.com/zfsonlinux/zfs/issues/new)
 		])
 	])
 ])

config/kernel-kmap-atomic-args.m4

@@ -3,17 +3,21 @@ dnl # 2.6.37 API change
 dnl # kmap_atomic changed from assigning hard-coded named slot to using
 dnl # push/pop based dynamical allocation.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_KMAP_ATOMIC_ARGS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KMAP_ATOMIC_ARGS], [
-	AC_MSG_CHECKING([whether kmap_atomic wants 1 args])
+	ZFS_LINUX_TEST_SRC([kmap_atomic], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/pagemap.h>
 	],[
 		struct page page;
 		kmap_atomic(&page);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KMAP_ATOMIC_ARGS], [
+	AC_MSG_CHECKING([whether kmap_atomic wants 1 args])
+	ZFS_LINUX_TEST_RESULT([kmap_atomic], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_1ARG_KMAP_ATOMIC, 1,
-		          [kmap_atomic wants 1 args])
+		    [kmap_atomic wants 1 args])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-kmem-cache.m4

@@ -5,30 +5,36 @@ dnl # private allocation flags which are applied when allocating a new slab
 dnl # in kmem_getpages().  Unfortunately there is no public API for setting
 dnl # non-default flags.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_ALLOCFLAGS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KMEM_CACHE_ALLOCFLAGS], [
-	AC_MSG_CHECKING([whether struct kmem_cache has allocflags])
+	ZFS_LINUX_TEST_SRC([kmem_cache_allocflags], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/slab.h>
 	],[
 		struct kmem_cache cachep __attribute__ ((unused));
 		cachep.allocflags = GFP_KERNEL;
+	])
+
+	ZFS_LINUX_TEST_SRC([kmem_cache_gfpflags], [
+		#include <linux/slab.h>
 	],[
+		struct kmem_cache cachep __attribute__ ((unused));
+		cachep.gfpflags = GFP_KERNEL;
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_ALLOCFLAGS], [
+	AC_MSG_CHECKING([whether struct kmem_cache has allocflags])
+	ZFS_LINUX_TEST_RESULT([kmem_cache_allocflags], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KMEM_CACHE_ALLOCFLAGS, 1,
-			[struct kmem_cache has allocflags])
+		    [struct kmem_cache has allocflags])
 	],[
 		AC_MSG_RESULT(no)
 
 		AC_MSG_CHECKING([whether struct kmem_cache has gfpflags])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([kmem_cache_gfpflags], [
-			#include <linux/slab.h>
-		],[
-			struct kmem_cache cachep __attribute__ ((unused));
-			cachep.gfpflags = GFP_KERNEL;
-		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_KMEM_CACHE_GFPFLAGS, 1,
-				[struct kmem_cache has gfpflags])
+			    [struct kmem_cache has gfpflags])
 		],[
 			AC_MSG_RESULT(no)
 		])
@@ -40,16 +46,10 @@ dnl # grsecurity API change,
 dnl # kmem_cache_create() with SLAB_USERCOPY flag replaced by
 dnl # kmem_cache_create_usercopy().
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_CREATE_USERCOPY], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KMEM_CACHE_CREATE_USERCOPY], [
-	AC_MSG_CHECKING([whether kmem_cache_create_usercopy() exists])
+	ZFS_LINUX_TEST_SRC([kmem_cache_create_usercopy], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/slab.h>
-		static void ctor(void *foo)
+		static void ctor(void *foo) { /* fake ctor */ }
-		{
-			// fake ctor
-		}
 	],[
 		struct kmem_cache *skc_linux_cache;
 		const char *name = "test";
@@ -60,13 +60,27 @@ AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_CREATE_USERCOPY], [
 		size_t usersize = size - useroffset;
 
 		skc_linux_cache = kmem_cache_create_usercopy(
-			name, size, align, flags, useroffset, usersize, ctor);
+		    name, size, align, flags, useroffset, usersize, ctor);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_CREATE_USERCOPY], [
+	AC_MSG_CHECKING([whether kmem_cache_create_usercopy() exists])
+	ZFS_LINUX_TEST_RESULT([kmem_cache_create_usercopy], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KMEM_CACHE_CREATE_USERCOPY, 1,
-				[kmem_cache_create_usercopy() exists])
+		    [kmem_cache_create_usercopy() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KMEM_CACHE], [
+	ZFS_AC_KERNEL_SRC_KMEM_CACHE_ALLOCFLAGS
+	ZFS_AC_KERNEL_SRC_KMEM_CACHE_CREATE_USERCOPY
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE], [
+	ZFS_AC_KERNEL_KMEM_CACHE_ALLOCFLAGS
+	ZFS_AC_KERNEL_KMEM_CACHE_CREATE_USERCOPY
 ])

config/kernel-kstrtoul.m4

@@ -1,18 +1,20 @@
 dnl #
 dnl # 2.6.39 API change
 dnl #
-dnl # 33ee3b2e2eb9 kstrto*: converting strings to integers done (hopefully) right
-dnl #
 dnl # If kstrtoul() doesn't exist, fallback to use strict_strtoul() which has
 dnl # existed since 2.6.25.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_KSTRTOUL], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KSTRTOUL], [
-	AC_MSG_CHECKING([whether kstrtoul() exists])
+	ZFS_LINUX_TEST_SRC([kstrtoul], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/kernel.h>
 	],[
 		int ret __attribute__ ((unused)) = kstrtoul(NULL, 10, NULL);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KSTRTOUL], [
+	AC_MSG_CHECKING([whether kstrtoul() exists])
+	ZFS_LINUX_TEST_RESULT([kstrtoul], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KSTRTOUL, 1, [kstrtoul() exists])
 	],[

config/kernel-ktime_get_coarse_real_ts64.m4

@@ -2,16 +2,21 @@ dnl #
 dnl # 4.18: ktime_get_coarse_real_ts64() added.  Use it in place of
 dnl # current_kernel_time64().
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64], [
-	[AC_MSG_CHECKING([whether ktime_get_coarse_real_ts64() exists])
+	ZFS_LINUX_TEST_SRC([ktime_get_coarse_real_ts64], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/mm.h>
 	], [
 		struct timespec64 ts;
 		ktime_get_coarse_real_ts64(&ts);
-	], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64], [
+	AC_MSG_CHECKING([whether ktime_get_coarse_real_ts64() exists])
+	ZFS_LINUX_TEST_RESULT([ktime_get_coarse_real_ts64], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_KTIME_GET_COARSE_REAL_TS64, 1, [ktime_get_coarse_real_ts64() exists])
+		AC_DEFINE(HAVE_KTIME_GET_COARSE_REAL_TS64, 1,
+		    [ktime_get_coarse_real_ts64() exists])
 	], [
 		AC_MSG_RESULT(no)
 	])

config/kernel-kuid-helpers.m4

@@ -5,14 +5,18 @@ dnl # became necessary to go through one more level of indirection
 dnl # when dealing with uid/gid - namely the kuid type.
 dnl #
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_KUID_HELPERS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KUID_HELPERS], [
-	AC_MSG_CHECKING([whether i_(uid|gid)_(read|write) exist])
+	ZFS_LINUX_TEST_SRC([i_uid_read], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct inode *ip = NULL;
 		(void) i_uid_read(ip);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KUID_HELPERS], [
+	AC_MSG_CHECKING([whether i_(uid|gid)_(read|write) exist])
+	ZFS_LINUX_TEST_RESULT([i_uid_read], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KUID_HELPERS, 1,
 		    [i_(uid|gid)_(read|write) exist])

config/kernel-kuidgid.m4

@@ -3,20 +3,26 @@ dnl # User namespaces, use kuid_t in place of uid_t
 dnl # where available. Not strictly a user namespaces thing
 dnl # but it should prevent surprises
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_KUIDGID_T], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KUIDGID_T], [
-	AC_MSG_CHECKING([whether kuid_t/kgid_t is available])
+	ZFS_LINUX_TEST_SRC([kuidgid_t_init], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/uidgid.h>
 	], [
 		kuid_t userid __attribute__ ((unused)) = KUIDT_INIT(0);
 		kgid_t groupid __attribute__ ((unused)) = KGIDT_INIT(0);
-	],[
+	])
-		ZFS_LINUX_TRY_COMPILE([
+
-			#include <linux/uidgid.h>
+	ZFS_LINUX_TEST_SRC([kuidgid_t], [
-		], [
+		#include <linux/uidgid.h>
-			kuid_t userid __attribute__ ((unused)) = 0;
+	], [
-			kgid_t groupid __attribute__ ((unused)) = 0;
+		kuid_t userid __attribute__ ((unused)) = 0;
-		],[
+		kgid_t groupid __attribute__ ((unused)) = 0;
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KUIDGID_T], [
+	AC_MSG_CHECKING([whether kuid_t/kgid_t is available])
+	ZFS_LINUX_TEST_RESULT([kuidgid_t_init], [
+		ZFS_LINUX_TEST_RESULT([kuidgid_t], [
 			AC_MSG_RESULT(yes; optional)
 		],[
 			AC_MSG_RESULT(yes; mandatory)

config/kernel-lookup-bdev.m4

@@ -2,23 +2,33 @@ dnl #
 dnl # 2.6.27, lookup_bdev() was exported.
 dnl # 4.4.0-6.21 - x.y on Ubuntu, lookup_bdev() takes 2 arguments.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_BDEV],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_LOOKUP_BDEV], [
-	[AC_MSG_CHECKING([whether lookup_bdev() wants 1 arg])
+	ZFS_LINUX_TEST_SRC([lookup_bdev_1arg], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 	], [
 		lookup_bdev(NULL);
-	], [lookup_bdev], [fs/block_dev.c], [
+	])
+
+	ZFS_LINUX_TEST_SRC([lookup_bdev_2args], [
+		#include <linux/fs.h>
+	], [
+		lookup_bdev(NULL, FMODE_READ);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_BDEV], [
+	AC_MSG_CHECKING([whether lookup_bdev() wants 1 arg])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([lookup_bdev_1arg],
+	    [lookup_bdev], [fs/block_dev.c], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_1ARG_LOOKUP_BDEV, 1, [lookup_bdev() wants 1 arg])
+		AC_DEFINE(HAVE_1ARG_LOOKUP_BDEV, 1,
+		    [lookup_bdev() wants 1 arg])
 	], [
 		AC_MSG_RESULT(no)
+
 		AC_MSG_CHECKING([whether lookup_bdev() wants 2 args])
-		ZFS_LINUX_TRY_COMPILE_SYMBOL([
+		ZFS_LINUX_TEST_RESULT_SYMBOL([lookup_bdev_2args],
-			#include <linux/fs.h>
+		    [lookup_bdev], [fs/block_dev.c], [
-		], [
-			lookup_bdev(NULL, FMODE_READ);
-		], [lookup_bdev], [fs/block_dev.c], [
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_2ARGS_LOOKUP_BDEV, 1,
 			    [lookup_bdev() wants 2 args])

config/kernel-lookup-nameidata.m4

@@ -1,9 +1,8 @@
 dnl #
 dnl # 3.6 API change
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_LOOKUP_NAMEIDATA], [
-	AC_MSG_CHECKING([whether iops->lookup() passes nameidata])
+	ZFS_LINUX_TEST_SRC([lookup_nameidata], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		#include <linux/sched.h>
 
@@ -15,11 +14,15 @@ AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [
 		    __attribute__ ((unused)) = {
 			.lookup	= inode_lookup,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [
+	AC_MSG_CHECKING([whether iops->lookup() passes nameidata])
+	ZFS_LINUX_TEST_RESULT([lookup_nameidata], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_LOOKUP_NAMEIDATA, 1,
-		          [iops->lookup() passes nameidata])
+		    [iops->lookup() passes nameidata])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-lseek-execute.m4

@@ -2,9 +2,8 @@ dnl #
 dnl # 3.11 API change
 dnl # lseek_execute helper exported
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_LSEEK_EXECUTE],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_LSEEK_EXECUTE], [
-	[AC_MSG_CHECKING([whether lseek_execute() is available])
+	ZFS_LINUX_TEST_SRC([lseek_execute], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 	], [
 		struct file *fp __attribute__ ((unused)) = NULL;
@@ -13,10 +12,15 @@ AC_DEFUN([ZFS_AC_KERNEL_LSEEK_EXECUTE],
 		loff_t maxsize __attribute__ ((unused)) = 0;
 
 		lseek_execute(fp, ip, offset, maxsize);
-	], [lseek_exclusive], [fs/read_write.c], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_LSEEK_EXECUTE], [
+	AC_MSG_CHECKING([whether lseek_execute() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([lseek_execute],
+	    [lseek_exclusive], [fs/read_write.c], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_LSEEK_EXECUTE, 1,
+		AC_DEFINE(HAVE_LSEEK_EXECUTE, 1, [lseek_execute() is available])
-		          [lseek_execute() is available])
 	], [
 		AC_MSG_RESULT(no)
 	])

config/kernel-make-request-fn.m4

@@ -0,0 +1,77 @@
+dnl #
+dnl # Check for make_request_fn interface.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN], [
+	ZFS_LINUX_TEST_SRC([make_request_fn_int], [
+		#include <linux/blkdev.h>
+		int make_request(struct request_queue *q,
+		    struct bio *bio) { return (0); }
+	],[
+		blk_queue_make_request(NULL, &make_request);
+	])
+
+	ZFS_LINUX_TEST_SRC([make_request_fn_void], [
+		#include <linux/blkdev.h>
+		void make_request(struct request_queue *q,
+		    struct bio *bio) { return; }
+	],[
+		blk_queue_make_request(NULL, &make_request);
+	])
+
+	ZFS_LINUX_TEST_SRC([make_request_fn_blk_qc_t], [
+		#include <linux/blkdev.h>
+		blk_qc_t make_request(struct request_queue *q,
+		    struct bio *bio) { return (BLK_QC_T_NONE); }
+	],[
+		blk_queue_make_request(NULL, &make_request);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_MAKE_REQUEST_FN], [
+	dnl #
+	dnl # Legacy API
+	dnl # make_request_fn returns int.
+	dnl #
+	AC_MSG_CHECKING([whether make_request_fn() returns int])
+	ZFS_LINUX_TEST_RESULT([make_request_fn_int], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(MAKE_REQUEST_FN_RET, int,
+		    [make_request_fn() return type])
+		AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_INT, 1,
+		    [Noting that make_request_fn() returns int])
+	],[
+		AC_MSG_RESULT(no)
+
+		dnl #
+		dnl # Linux 3.2 API Change
+		dnl # make_request_fn returns void.
+		dnl #
+		AC_MSG_CHECKING([whether make_request_fn() returns void])
+		ZFS_LINUX_TEST_RESULT([make_request_fn_void], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(MAKE_REQUEST_FN_RET, void,
+			    [make_request_fn() return type])
+			AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_VOID, 1,
+			    [Noting that make_request_fn() returns void])
+		],[
+			AC_MSG_RESULT(no)
+
+			dnl #
+			dnl # Linux 4.4 API Change
+			dnl # make_request_fn returns blk_qc_t.
+			dnl #
+			AC_MSG_CHECKING(
+			    [whether make_request_fn() returns blk_qc_t])
+			ZFS_LINUX_TEST_RESULT([make_request_fn_blk_qc_t], [
+				AC_MSG_RESULT(yes)
+				AC_DEFINE(MAKE_REQUEST_FN_RET, blk_qc_t,
+				    [make_request_fn() return type])
+				AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_QC, 1,
+				    [Noting that make_request_fn() ]
+				    [returns blk_qc_t])
+			],[
+				ZFS_LINUX_TEST_ERROR([make_request_fn])
+			])
+		])
+	])
+])

config/kernel-misc-minor.m4

@@ -6,7 +6,7 @@ dnl # number.  Start with a large known available unreserved minor and work
 dnl # our way down to lower value if a collision is detected.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_MISC_MINOR], [
-	AC_MSG_CHECKING([for available /dev/zfs minor])
+	AC_MSG_CHECKING([whether /dev/zfs minor is available])
 
 	for i in $(seq 249 -1 200); do
 		if ! grep -q "^#define\s\+.*_MINOR\s\+.*$i" \

config/kernel-mk-request-fn.m4

@@ -1,65 +0,0 @@
-dnl #
-dnl # Linux 3.2 API Change
-dnl # make_request_fn returns void instead of int.
-dnl #
-dnl # Linux 4.4 API Change
-dnl # make_request_fn returns blk_qc_t.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_MAKE_REQUEST_FN], [
-	AC_MSG_CHECKING([whether make_request_fn() returns int])
-	ZFS_LINUX_TRY_COMPILE([
-		#include <linux/blkdev.h>
-
-		int make_request(struct request_queue *q, struct bio *bio)
-		{
-			return (0);
-		}
-	],[
-		blk_queue_make_request(NULL, &make_request);
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(MAKE_REQUEST_FN_RET, int,
-		    [make_request_fn() returns int])
-		AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_INT, 1,
-		    [Noting that make_request_fn() returns int])
-	],[
-		AC_MSG_RESULT(no)
-		AC_MSG_CHECKING([whether make_request_fn() returns void])
-		ZFS_LINUX_TRY_COMPILE([
-			#include <linux/blkdev.h>
-
-			void make_request(struct request_queue *q, struct bio *bio)
-			{
-				return;
-			}
-		],[
-			blk_queue_make_request(NULL, &make_request);
-		],[
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(MAKE_REQUEST_FN_RET, void,
-			    [make_request_fn() returns void])
-		],[
-			AC_MSG_RESULT(no)
-			AC_MSG_CHECKING([whether make_request_fn() returns blk_qc_t])
-			ZFS_LINUX_TRY_COMPILE([
-				#include <linux/blkdev.h>
-
-				blk_qc_t make_request(struct request_queue *q, struct bio *bio)
-				{
-					return (BLK_QC_T_NONE);
-				}
-			],[
-				blk_queue_make_request(NULL, &make_request);
-			],[
-				AC_MSG_RESULT(yes)
-				AC_DEFINE(MAKE_REQUEST_FN_RET, blk_qc_t,
-				    [make_request_fn() returns blk_qc_t])
-				AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_QC, 1,
-				    [Noting that make_request_fn() returns blk_qc_t])
-			],[
-				AC_MSG_ERROR(no - Please file a bug report at
-				    https://github.com/zfsonlinux/zfs/issues/new)
-			])
-		])
-	])
-])

config/kernel-mkdir-umode-t.m4

@@ -6,9 +6,8 @@ dnl # would also change all three prototypes.  However, if it turns out that
 dnl # some distribution doesn't backport the whole thing this could be
 dnl # broken apart into three separate checks.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_MKDIR_UMODE_T], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_MKDIR_UMODE_T], [
-	AC_MSG_CHECKING([whether iops->create()/mkdir()/mknod() take umode_t])
+	ZFS_LINUX_TEST_SRC([inode_operations_mkdir], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int mkdir(struct inode *inode, struct dentry *dentry,
@@ -18,8 +17,12 @@ AC_DEFUN([ZFS_AC_KERNEL_MKDIR_UMODE_T], [
 		    iops __attribute__ ((unused)) = {
 			.mkdir = mkdir,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_MKDIR_UMODE_T], [
+	AC_MSG_CHECKING([whether iops->create()/mkdir()/mknod() take umode_t])
+	ZFS_LINUX_TEST_RESULT([inode_operations_mkdir], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_MKDIR_UMODE_T, 1,
 		    [iops->create()/mkdir()/mknod() take umode_t])

config/kernel-mod-param.m4

@@ -2,9 +2,8 @@ dnl #
 dnl # Grsecurity kernel API change
 dnl # constified parameters of module_param_call() methods
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_MODULE_PARAM_CALL_CONST], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_MODULE_PARAM_CALL_CONST], [
-	AC_MSG_CHECKING([whether module_param_call() is hardened])
+	ZFS_LINUX_TEST_SRC([module_param_call], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/module.h>
 		#include <linux/moduleparam.h>
 
@@ -19,8 +18,12 @@ AC_DEFUN([ZFS_AC_KERNEL_MODULE_PARAM_CALL_CONST], [
 		}
 
 		module_param_call(p, param_set, param_get, NULL, 0644);
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_MODULE_PARAM_CALL_CONST], [
+	AC_MSG_CHECKING([whether module_param_call() is hardened])
+	ZFS_LINUX_TEST_RESULT([module_param_call], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(MODULE_PARAM_CALL_CONST, 1,
 		    [hardened module_param_call])

config/kernel-objtool.m4

@@ -1,41 +1,44 @@
 dnl #
-dnl # 4.6 API for compile-time stack validation
+dnl # Check for objtool support.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_OBJTOOL], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_OBJTOOL], [
-	AC_MSG_CHECKING([for compile-time stack validation (objtool)])
+
-	ZFS_LINUX_TRY_COMPILE([
+	dnl # 4.6 API for compile-time stack validation
+	ZFS_LINUX_TEST_SRC([objtool], [
 		#undef __ASSEMBLY__
 		#include <asm/frame.h>
 	],[
 		#if !defined(FRAME_BEGIN)
 		CTASSERT(1);
 		#endif
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_KERNEL_OBJTOOL, 1,
-		    [kernel does stack verification])
-
-		ZFS_AC_KERNEL_STACK_FRAME_NON_STANDARD
-	],[
-		AC_MSG_RESULT(no)
 	])
-])
 
-dnl #
+	dnl # 4.6 API added STACK_FRAME_NON_STANDARD macro
-dnl # 4.6 API added STACK_FRAME_NON_STANDARD macro
+	ZFS_LINUX_TEST_SRC([stack_frame_non_standard], [
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_STACK_FRAME_NON_STANDARD], [
-	AC_MSG_CHECKING([whether STACK_FRAME_NON_STANDARD is defined])
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/frame.h>
 	],[
 		#if !defined(STACK_FRAME_NON_STANDARD)
 		CTASSERT(1);
 		#endif
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_OBJTOOL], [
+	AC_MSG_CHECKING(
+	    [whether compile-time stack validation (objtool) is available])
+	ZFS_LINUX_TEST_RESULT([objtool], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_STACK_FRAME_NON_STANDARD, 1,
+		AC_DEFINE(HAVE_KERNEL_OBJTOOL, 1,
-		   [STACK_FRAME_NON_STANDARD is defined])
+		    [kernel does stack verification])
+
+		AC_MSG_CHECKING([whether STACK_FRAME_NON_STANDARD is defined])
+		ZFS_LINUX_TEST_RESULT([stack_frame_non_standard], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_STACK_FRAME_NON_STANDARD, 1,
+			   [STACK_FRAME_NON_STANDARD is defined])
+		],[
+			AC_MSG_RESULT(no)
+		])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-open-bdev-exclusive.m4

@@ -2,16 +2,21 @@ dnl #
 dnl # 2.6.28 API change
 dnl # open/close_bdev_excl() renamed to open/close_bdev_exclusive()
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_OPEN_BDEV_EXCLUSIVE],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BDEV_OPEN_EXCLUSIVE], [
-	[AC_MSG_CHECKING([whether open_bdev_exclusive() is available])
+	ZFS_LINUX_TEST_SRC([open_bdev_exclusive], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 	], [
 		open_bdev_exclusive(NULL, 0, NULL);
-	], [open_bdev_exclusive], [fs/block_dev.c], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BDEV_OPEN_EXCLUSIVE], [
+	AC_MSG_CHECKING([whether open_bdev_exclusive() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([open_bdev_exclusive],
+	    [open_bdev_exclusive], [fs/block_dev.c], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_OPEN_BDEV_EXCLUSIVE, 1,
-		          [open_bdev_exclusive() is available])
+		    [open_bdev_exclusive() is available])
 	], [
 		AC_MSG_RESULT(no)
 	])

config/kernel-pde-data.m4

@@ -2,15 +2,19 @@ dnl #
 dnl # 3.10 API change,
 dnl # PDE is replaced by PDE_DATA
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_PDE_DATA], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_PDE_DATA], [
-	AC_MSG_CHECKING([whether PDE_DATA() is available])
+	ZFS_LINUX_TEST_SRC([pde_data], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/proc_fs.h>
 	], [
 		PDE_DATA(NULL);
-	], [PDE_DATA], [], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_PDE_DATA], [
+	AC_MSG_CHECKING([whether PDE_DATA() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([pde_data], [PDE_DATA], [], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_PDE_DATA, 1, [yes])
+		AC_DEFINE(HAVE_PDE_DATA, 1, [PDE_DATA is available])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-put-link.m4

@@ -1,17 +1,35 @@
 dnl #
 dnl # Supported symlink APIs
 dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_PUT_LINK], [
+	ZFS_LINUX_TEST_SRC([put_link_cookie], [
+		#include <linux/fs.h>
+		void put_link(struct inode *ip, void *cookie)
+		    { return; }
+		static struct inode_operations
+		    iops __attribute__ ((unused)) = {
+			.put_link = put_link,
+		};
+	],[])
+
+	ZFS_LINUX_TEST_SRC([put_link_nameidata], [
+		#include <linux/fs.h>
+		void put_link(struct dentry *de, struct
+		    nameidata *nd, void *ptr) { return; }
+		static struct inode_operations
+		    iops __attribute__ ((unused)) = {
+			.put_link = put_link,
+		};
+	],[])
+])
+
 AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [
 	dnl #
 	dnl # 4.5 API change
 	dnl # get_link() uses delayed done, there is no put_link() interface.
+	dnl # This check intially uses the inode_operations_get_link result
 	dnl #
-	ZFS_LINUX_TRY_COMPILE([
+	ZFS_LINUX_TEST_RESULT([inode_operations_get_link], [
-		#if !defined(HAVE_GET_LINK_DELAYED)
-		#error "Expecting get_link() delayed done"
-		#endif
-	],[
-	],[
 		AC_DEFINE(HAVE_PUT_LINK_DELAYED, 1, [iops->put_link() delayed])
 	],[
 		dnl #
@@ -19,41 +37,24 @@ AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [
 		dnl # This kernel retired the nameidata structure.
 		dnl #
 		AC_MSG_CHECKING([whether iops->put_link() passes cookie])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([put_link_cookie], [
-			#include <linux/fs.h>
-			void put_link(struct inode *ip, void *cookie)
-			    { return; }
-			static struct inode_operations
-			    iops __attribute__ ((unused)) = {
-				.put_link = put_link,
-			};
-		],[
-		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_PUT_LINK_COOKIE, 1,
 			    [iops->put_link() cookie])
 		],[
+			AC_MSG_RESULT(no)
+
 			dnl #
 			dnl # 2.6.32 API
 			dnl #
-			AC_MSG_RESULT(no)
 			AC_MSG_CHECKING(
 			    [whether iops->put_link() passes nameidata])
-			ZFS_LINUX_TRY_COMPILE([
+			ZFS_LINUX_TEST_RESULT([put_link_nameidata], [
-				#include <linux/fs.h>
-				void put_link(struct dentry *de, struct
-				    nameidata *nd, void *ptr) { return; }
-				static struct inode_operations
-				    iops __attribute__ ((unused)) = {
-					.put_link = put_link,
-				};
-			],[
-			],[
 				AC_MSG_RESULT(yes)
 				AC_DEFINE(HAVE_PUT_LINK_NAMEIDATA, 1,
 				    [iops->put_link() nameidata])
 			],[
-				AC_MSG_ERROR(no; please file a bug report)
+				ZFS_LINUX_TEST_ERROR([put_link])
 			])
 		])
 	])

config/kernel-rename.m4

@@ -3,9 +3,8 @@ dnl # 4.9 API change,
 dnl # iops->rename2() merged into iops->rename(), and iops->rename() now wants
 dnl # flags.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_RENAME_WANTS_FLAGS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME_WANTS_FLAGS], [
-	AC_MSG_CHECKING([whether iops->rename() wants flags])
+	ZFS_LINUX_TEST_SRC([inode_operations_rename], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		int rename_fn(struct inode *sip, struct dentry *sdp,
 			struct inode *tip, struct dentry *tdp,
@@ -15,10 +14,15 @@ AC_DEFUN([ZFS_AC_KERNEL_RENAME_WANTS_FLAGS], [
 		    iops __attribute__ ((unused)) = {
 			.rename = rename_fn,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_RENAME_WANTS_FLAGS], [
+	AC_MSG_CHECKING([whether iops->rename() wants flags])
+	ZFS_LINUX_TEST_RESULT([inode_operations_rename], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_RENAME_WANTS_FLAGS, 1, [iops->rename() wants flags])
+		AC_DEFINE(HAVE_RENAME_WANTS_FLAGS, 1,
+		    [iops->rename() wants flags])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-rw.m4

@@ -3,11 +3,8 @@ dnl # 4.14 API change
 dnl # kernel_write() which was introduced in 3.9 was updated to take
 dnl # the offset as a pointer which is needed by vn_rdwr().
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_WRITE], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_WRITE], [
-	AC_MSG_CHECKING([whether kernel_write() takes loff_t pointer])
+	ZFS_LINUX_TEST_SRC([kernel_write], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct file *file = NULL;
@@ -17,14 +14,18 @@ AC_DEFUN([ZFS_AC_KERNEL_WRITE], [
 		ssize_t ret;
 
 		ret = kernel_write(file, buf, count, pos);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_WRITE], [
+	AC_MSG_CHECKING([whether kernel_write() takes loff_t pointer])
+	ZFS_LINUX_TEST_RESULT([kernel_write], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KERNEL_WRITE_PPOS, 1,
 		    [kernel_write() take loff_t pointer])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])
 
 dnl #
@@ -32,11 +33,8 @@ dnl # 4.14 API change
 dnl # kernel_read() which has existed for forever was updated to take
 dnl # the offset as a pointer which is needed by vn_rdwr().
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_READ], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_READ], [
-	AC_MSG_CHECKING([whether kernel_read() takes loff_t pointer])
+	ZFS_LINUX_TEST_SRC([kernel_read], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct file *file = NULL;
@@ -46,12 +44,26 @@ AC_DEFUN([ZFS_AC_KERNEL_READ], [
 		ssize_t ret;
 
 		ret = kernel_read(file, buf, count, pos);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_READ], [
+	AC_MSG_CHECKING([whether kernel_read() takes loff_t pointer])
+	ZFS_LINUX_TEST_RESULT([kernel_read], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KERNEL_READ_PPOS, 1,
 		    [kernel_read() take loff_t pointer])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_RW], [
+	ZFS_AC_KERNEL_SRC_WRITE
+	ZFS_AC_KERNEL_SRC_READ
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_RW], [
+	ZFS_AC_KERNEL_WRITE
+	ZFS_AC_KERNEL_READ
 ])

config/kernel-rwsem.m4

@@ -4,25 +4,26 @@ dnl #
 dnl # The rw_semaphore.wait_lock member was changed from spinlock_t to
 dnl # raw_spinlock_t at commit ddb6c9b58a19edcfac93ac670b066c836ff729f1.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_RWSEM_SPINLOCK_IS_RAW], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_RWSEM_SPINLOCK_IS_RAW], [
-	AC_MSG_CHECKING([whether struct rw_semaphore member wait_lock is raw])
+	ZFS_LINUX_TEST_SRC([rwsem_spinlock_is_raw], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/rwsem.h>
 	],[
 		struct rw_semaphore dummy_semaphore __attribute__ ((unused));
 		raw_spinlock_t dummy_lock __attribute__ ((unused)) =
 		    __RAW_SPIN_LOCK_INITIALIZER(dummy_lock);
 		dummy_semaphore.wait_lock = dummy_lock;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_RWSEM_SPINLOCK_IS_RAW], [
+	AC_MSG_CHECKING([whether struct rw_semaphore member wait_lock is raw])
+	ZFS_LINUX_TEST_RESULT([rwsem_spinlock_is_raw], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(RWSEM_SPINLOCK_IS_RAW, 1,
-		[struct rw_semaphore member wait_lock is raw_spinlock_t])
+		    [struct rw_semaphore member wait_lock is raw_spinlock_t])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])
 
 dnl #
@@ -30,23 +31,24 @@ dnl # 3.16 API Change
 dnl #
 dnl # rwsem-spinlock "->activity" changed to "->count"
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_RWSEM_ACTIVITY], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_RWSEM_ACTIVITY], [
-	AC_MSG_CHECKING([whether struct rw_semaphore has member activity])
+	ZFS_LINUX_TEST_SRC([rwsem_activity], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/rwsem.h>
 	],[
 		struct rw_semaphore dummy_semaphore __attribute__ ((unused));
 		dummy_semaphore.activity = 0;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_RWSEM_ACTIVITY], [
+	AC_MSG_CHECKING([whether struct rw_semaphore has member activity])
+	ZFS_LINUX_TEST_RESULT([rwsem_activity], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_RWSEM_ACTIVITY, 1,
-		[struct rw_semaphore has member activity])
+		    [struct rw_semaphore has member activity])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])
 
 dnl #
@@ -54,22 +56,35 @@ dnl # 4.8 API Change
 dnl #
 dnl # rwsem "->count" changed to atomic_long_t type
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_RWSEM_ATOMIC_LONG_COUNT], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_RWSEM_ATOMIC_LONG_COUNT], [
-	AC_MSG_CHECKING(
+	ZFS_LINUX_TEST_SRC([rwsem_atomic_long_count], [
-	[whether struct rw_semaphore has atomic_long_t member count])
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/rwsem.h>
 	],[
 		DECLARE_RWSEM(dummy_semaphore);
 		(void) atomic_long_read(&dummy_semaphore.count);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_RWSEM_ATOMIC_LONG_COUNT], [
+	AC_MSG_CHECKING(
+	    [whether struct rw_semaphore has atomic_long_t member count])
+	ZFS_LINUX_TEST_RESULT([rwsem_atomic_long_count], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_RWSEM_ATOMIC_LONG_COUNT, 1,
-		[struct rw_semaphore has atomic_long_t member count])
+		    [struct rw_semaphore has atomic_long_t member count])
 	],[
 		AC_MSG_RESULT(no)
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_RWSEM], [
+	ZFS_AC_KERNEL_SRC_RWSEM_SPINLOCK_IS_RAW
+	ZFS_AC_KERNEL_SRC_RWSEM_ACTIVITY
+	ZFS_AC_KERNEL_SRC_RWSEM_ATOMIC_LONG_COUNT
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_RWSEM], [
+	ZFS_AC_KERNEL_RWSEM_SPINLOCK_IS_RAW
+	ZFS_AC_KERNEL_RWSEM_ACTIVITY
+	ZFS_AC_KERNEL_RWSEM_ATOMIC_LONG_COUNT
 ])

config/kernel-sched.m4

@@ -2,14 +2,18 @@ dnl #
 dnl # 3.9 API change,
 dnl # Moved things from linux/sched.h to linux/sched/rt.h
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SCHED_RT_HEADER],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SCHED_RT_HEADER], [
-	[AC_MSG_CHECKING([whether header linux/sched/rt.h exists])
+	ZFS_LINUX_TEST_SRC([sched_rt_header], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/sched.h>
 		#include <linux/sched/rt.h>
 	],[
 		return 0;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SCHED_RT_HEADER], [
+	AC_MSG_CHECKING([whether header linux/sched/rt.h exists])
+	ZFS_LINUX_TEST_RESULT([sched_rt_header], [
 		AC_DEFINE(HAVE_SCHED_RT_HEADER, 1, [linux/sched/rt.h exists])
 		AC_MSG_RESULT(yes)
 	],[
@@ -21,36 +25,59 @@ dnl #
 dnl # 4.11 API change,
 dnl # Moved things from linux/sched.h to linux/sched/signal.h
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SCHED_SIGNAL_HEADER],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SCHED_SIGNAL_HEADER], [
-	[AC_MSG_CHECKING([whether header linux/sched/signal.h exists])
+	ZFS_LINUX_TEST_SRC([sched_signal_header], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/sched.h>
 		#include <linux/sched/signal.h>
 	],[
 		return 0;
-	],[
+	])
-		AC_DEFINE(HAVE_SCHED_SIGNAL_HEADER, 1, [linux/sched/signal.h exists])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SCHED_SIGNAL_HEADER], [
+	AC_MSG_CHECKING([whether header linux/sched/signal.h exists])
+	ZFS_LINUX_TEST_RESULT([sched_signal_header], [
+		AC_DEFINE(HAVE_SCHED_SIGNAL_HEADER, 1,
+		    [linux/sched/signal.h exists])
 		AC_MSG_RESULT(yes)
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
+
 dnl #
 dnl # 3.19 API change
 dnl # The io_schedule_timeout() function is present in all 2.6.32 kernels
 dnl # but it was not exported until Linux 3.19.  The RHEL 7.x kernels which
 dnl # are based on a 3.10 kernel do export this symbol.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_IO_SCHEDULE_TIMEOUT], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_IO_SCHEDULE_TIMEOUT], [
-	AC_MSG_CHECKING([whether io_schedule_timeout() is available])
+	ZFS_LINUX_TEST_SRC([io_schedule_timeout], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/sched.h>
 	], [
 		(void) io_schedule_timeout(1);
-	], [io_schedule_timeout], [], [
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_IO_SCHEDULE_TIMEOUT], [
+	AC_MSG_CHECKING([whether io_schedule_timeout() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([io_schedule_timeout],
+	[io_schedule_timeout], [], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_IO_SCHEDULE_TIMEOUT, 1, [yes])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SCHED], [
+	ZFS_AC_KERNEL_SRC_SCHED_RT_HEADER
+	ZFS_AC_KERNEL_SRC_SCHED_SIGNAL_HEADER
+	ZFS_AC_KERNEL_SRC_IO_SCHEDULE_TIMEOUT
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SCHED], [
+	ZFS_AC_KERNEL_SCHED_RT_HEADER
+	ZFS_AC_KERNEL_SCHED_SIGNAL_HEADER
+	ZFS_AC_KERNEL_IO_SCHEDULE_TIMEOUT
+])

config/kernel-security-inode-init.m4

@@ -5,9 +5,8 @@ dnl # qstr argument which must be passed in from the dentry if available.
 dnl # Passing a NULL is safe when no qstr is available the relevant
 dnl # security checks will just be skipped.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SECURITY_INODE_INIT_SECURITY_6ARGS], [
-	AC_MSG_CHECKING([whether security_inode_init_security wants 6 args])
+	ZFS_LINUX_TEST_SRC([security_inode_init_security_6args], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/security.h>
 	],[
 		struct inode *ip __attribute__ ((unused)) = NULL;
@@ -18,10 +17,15 @@ AC_DEFUN([ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY], [
 		size_t len __attribute__ ((unused)) = 0;
 
 		security_inode_init_security(ip, dip, str, &name, &value, &len);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SECURITY_INODE_INIT_SECURITY_6ARGS], [
+	AC_MSG_CHECKING([whether security_inode_init_security wants 6 args])
+	ZFS_LINUX_TEST_RESULT([security_inode_init_security_6args], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_6ARGS_SECURITY_INODE_INIT_SECURITY, 1,
-		          [security_inode_init_security wants 6 args])
+		    [security_inode_init_security wants 6 args])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -34,9 +38,8 @@ dnl # a filesystem specific callback to write security extended attributes.
 dnl # This was done to support the initialization of multiple LSM xattrs
 dnl # and the EVM xattr.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SECURITY_INODE_INIT_SECURITY_CALLBACK], [
-	AC_MSG_CHECKING([whether security_inode_init_security wants callback])
+	ZFS_LINUX_TEST_SRC([security_inode_init_security], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/security.h>
 	],[
 		struct inode *ip __attribute__ ((unused)) = NULL;
@@ -45,11 +48,26 @@ AC_DEFUN([ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY], [
 		initxattrs func __attribute__ ((unused)) = NULL;
 
 		security_inode_init_security(ip, dip, str, func, NULL);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SECURITY_INODE_INIT_SECURITY_CALLBACK], [
+	AC_MSG_CHECKING([whether security_inode_init_security wants callback])
+	ZFS_LINUX_TEST_RESULT([security_inode_init_security], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_CALLBACK_SECURITY_INODE_INIT_SECURITY, 1,
-		          [security_inode_init_security wants callback])
+		    [security_inode_init_security wants callback])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SECURITY_INODE], [
+	ZFS_AC_KERNEL_SRC_SECURITY_INODE_INIT_SECURITY_6ARGS
+	ZFS_AC_KERNEL_SRC_SECURITY_INODE_INIT_SECURITY_CALLBACK
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SECURITY_INODE], [
+	ZFS_AC_KERNEL_SECURITY_INODE_INIT_SECURITY_6ARGS
+	ZFS_AC_KERNEL_SECURITY_INODE_INIT_SECURITY_CALLBACK
+])

config/kernel-set-nlink.m4

@@ -2,18 +2,21 @@ dnl #
 dnl # Linux v3.2-rc1 API change
 dnl # SHA: bfe8684869601dacfcb2cd69ef8cfd9045f62170
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SET_NLINK], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SET_NLINK], [
-	AC_MSG_CHECKING([whether set_nlink() is available])
+	ZFS_LINUX_TEST_SRC([set_nlink], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct inode node;
 		unsigned int link = 0;
 		(void) set_nlink(&node, link);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SET_NLINK], [
+	AC_MSG_CHECKING([whether set_nlink() is available])
+	ZFS_LINUX_TEST_RESULT([set_nlink], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SET_NLINK, 1,
+		AC_DEFINE(HAVE_SET_NLINK, 1, [set_nlink() is available])
-		          [set_nlink() is available])
 	],[
 		AC_MSG_RESULT(no)
 	])

config/kernel-setattr-prepare.m4

@@ -3,17 +3,21 @@ dnl # 4.9 API change
 dnl # The inode_change_ok() function has been renamed setattr_prepare()
 dnl # and updated to take a dentry rather than an inode.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SETATTR_PREPARE],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SETATTR_PREPARE], [
-	[AC_MSG_CHECKING([whether setattr_prepare() is available])
+	ZFS_LINUX_TEST_SRC([setattr_prepare], [
-	ZFS_LINUX_TRY_COMPILE_SYMBOL([
 		#include <linux/fs.h>
 	], [
 		struct dentry *dentry = NULL;
 		struct iattr *attr = NULL;
-		int error;
+		int error __attribute__ ((unused)) =
+		    setattr_prepare(dentry, attr);
+	])
+])
 
-		error = setattr_prepare(dentry, attr);
+AC_DEFUN([ZFS_AC_KERNEL_SETATTR_PREPARE], [
-	], [setattr_prepare], [fs/attr.c], [
+	AC_MSG_CHECKING([whether setattr_prepare() is available])
+	ZFS_LINUX_TEST_RESULT_SYMBOL([setattr_prepare],
+	    [setattr_prepare], [fs/attr.c], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SETATTR_PREPARE, 1,
 		    [setattr_prepare() is available])

config/kernel-sget-args.m4

@@ -2,9 +2,8 @@ dnl #
 dnl # 3.6 API change,
 dnl # 'sget' now takes the mount flags as an argument.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_5ARG_SGET],
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SGET], [
-	[AC_MSG_CHECKING([whether sget() wants 5 args])
+	ZFS_LINUX_TEST_SRC([sget_5args], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct file_system_type *type = NULL;
@@ -13,11 +12,15 @@ AC_DEFUN([ZFS_AC_KERNEL_5ARG_SGET],
 		int flags = 0;
 		void *data = NULL;
 		(void) sget(type, test, set, flags, data);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SGET], [
+	AC_MSG_CHECKING([whether sget() wants 5 args])
+	ZFS_LINUX_TEST_RESULT([sget_5args], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_5ARG_SGET, 1, [sget() wants 5 args])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
-

config/kernel-show-options.m4

@@ -1,21 +1,26 @@
 dnl #
 dnl # Linux 3.3 API
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SHOW_OPTIONS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SHOW_OPTIONS], [
-	AC_MSG_CHECKING([whether sops->show_options() wants dentry])
+	ZFS_LINUX_TEST_SRC([super_operations_show_options], [
-
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
-		int show_options (struct seq_file * x, struct dentry * y) { return 0; };
+		int show_options(struct seq_file * x, struct dentry * y) {
+			return 0;
+		};
+
 		static struct super_operations sops __attribute__ ((unused)) = {
 			.show_options = show_options,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SHOW_OPTIONS], [
+	AC_MSG_CHECKING([whether sops->show_options() wants dentry])
+	ZFS_LINUX_TEST_RESULT([super_operations_show_options], [
 		AC_MSG_RESULT([yes])
 		AC_DEFINE(HAVE_SHOW_OPTIONS_WITH_DENTRY, 1,
-			[sops->show_options() with dentry])
+		    [sops->show_options() with dentry])
 	],[
 		AC_MSG_RESULT([no])
 	])

config/kernel-shrink.m4

@@ -4,9 +4,8 @@ dnl # The super_block structure now stores a per-filesystem shrinker.
 dnl # This interface is preferable because it can be used to specifically
 dnl # target only the zfs filesystem for pruning.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SHRINK], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_SHRINK], [
-	AC_MSG_CHECKING([whether super_block has s_shrink])
+	ZFS_LINUX_TEST_SRC([super_block_s_shrink], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int shrink(struct shrinker *s, struct shrink_control *sc)
@@ -18,8 +17,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINK], [
 			.s_shrink.seeks = DEFAULT_SEEKS,
 			.s_shrink.batch = 0,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SUPER_BLOCK_S_SHRINK], [
+	AC_MSG_CHECKING([whether super_block has s_shrink])
+	ZFS_LINUX_TEST_RESULT([super_block_s_shrink], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SHRINK, 1, [struct super_block has s_shrink])
 
@@ -50,15 +53,18 @@ dnl # a list_head is used.  Then to prevent the spinning from occurring
 dnl # the .next pointer is set to the fs_supers list_head which ensures
 dnl # the iterate_supers_type() function will always terminate.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_S_INSTANCES_LIST_HEAD], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_INSTANCES_LIST_HEAD], [
-	AC_MSG_CHECKING([whether super_block has s_instances list_head])
+	ZFS_LINUX_TEST_SRC([super_block_s_instances_list_head], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct super_block sb __attribute__ ((unused));
-
 		INIT_LIST_HEAD(&sb.s_instances);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SUPER_BLOCK_S_INSTANCES_LIST_HEAD], [
+	AC_MSG_CHECKING([whether super_block has s_instances list_head])
+	ZFS_LINUX_TEST_RESULT([super_block_s_instances_list_head], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_S_INSTANCES_LIST_HEAD, 1,
 		    [struct super_block has s_instances list_head])
@@ -67,9 +73,8 @@ AC_DEFUN([ZFS_AC_KERNEL_S_INSTANCES_LIST_HEAD], [
 	])
 ])
 
-AC_DEFUN([ZFS_AC_KERNEL_NR_CACHED_OBJECTS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_NR_CACHED_OBJECTS], [
-	AC_MSG_CHECKING([whether sops->nr_cached_objects() exists])
+	ZFS_LINUX_TEST_SRC([nr_cached_objects], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		int nr_cached_objects(struct super_block *sb) { return 0; }
@@ -78,19 +83,22 @@ AC_DEFUN([ZFS_AC_KERNEL_NR_CACHED_OBJECTS], [
 		    sops __attribute__ ((unused)) = {
 			.nr_cached_objects = nr_cached_objects,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_NR_CACHED_OBJECTS], [
+	AC_MSG_CHECKING([whether sops->nr_cached_objects() exists])
+	ZFS_LINUX_TEST_RESULT([nr_cached_objects], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_NR_CACHED_OBJECTS, 1,
-			[sops->nr_cached_objects() exists])
+		    [sops->nr_cached_objects() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
 
-AC_DEFUN([ZFS_AC_KERNEL_FREE_CACHED_OBJECTS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FREE_CACHED_OBJECTS], [
-	AC_MSG_CHECKING([whether sops->free_cached_objects() exists])
+	ZFS_LINUX_TEST_SRC([free_cached_objects], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 
 		void free_cached_objects(struct super_block *sb, int x)
@@ -100,11 +108,15 @@ AC_DEFUN([ZFS_AC_KERNEL_FREE_CACHED_OBJECTS], [
 		    sops __attribute__ ((unused)) = {
 			.free_cached_objects = free_cached_objects,
 		};
-	],[
+	],[])
-	],[
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FREE_CACHED_OBJECTS], [
+	AC_MSG_CHECKING([whether sops->free_cached_objects() exists])
+	ZFS_LINUX_TEST_RESULT([free_cached_objects], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_FREE_CACHED_OBJECTS, 1,
-			[sops->free_cached_objects() exists])
+		    [sops->free_cached_objects() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -115,15 +127,19 @@ dnl # 3.12 API change
 dnl # The nid member was added to struct shrink_control to support
 dnl # NUMA-aware shrinkers.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINK_CONTROL_HAS_NID], [
-	AC_MSG_CHECKING([whether shrink_control has nid])
+	ZFS_LINUX_TEST_SRC([shrink_control_nid], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 	],[
 		struct shrink_control sc __attribute__ ((unused));
 		unsigned long scnidsize __attribute__ ((unused)) =
 		    sizeof(sc.nid);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID], [
+	AC_MSG_CHECKING([whether shrink_control has nid])
+	ZFS_LINUX_TEST_RESULT([shrink_control_nid], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(SHRINK_CONTROL_HAS_NID, 1,
 		    [struct shrink_control has nid])
@@ -132,84 +148,96 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID], [
 	])
 ])
 
-
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINKER_CALLBACK], [
-AC_DEFUN([ZFS_AC_KERNEL_SHRINKER_CALLBACK],[
+	ZFS_LINUX_TEST_SRC([shrinker_cb_2arg], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-	dnl #
-	dnl # 2.6.23 to 2.6.34 API change
-	dnl # ->shrink(int nr_to_scan, gfp_t gfp_mask)
-	dnl #
-	AC_MSG_CHECKING([whether old 2-argument shrinker exists])
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/mm.h>
-
+		int shrinker_cb(int nr_to_scan, gfp_t gfp_mask) { return 0; }
-		int shrinker_cb(int nr_to_scan, gfp_t gfp_mask) {
-			return 0;
-		}
 	],[
 		struct shrinker cache_shrinker = {
 			.shrink = shrinker_cb,
 			.seeks = DEFAULT_SEEKS,
 		};
 		register_shrinker(&cache_shrinker);
+	])
+
+	ZFS_LINUX_TEST_SRC([shrinker_cb_3arg], [
+		#include <linux/mm.h>
+		int shrinker_cb(struct shrinker *shrink, int nr_to_scan,
+		    gfp_t gfp_mask) { return 0; }
 	],[
+		struct shrinker cache_shrinker = {
+			.shrink = shrinker_cb,
+			.seeks = DEFAULT_SEEKS,
+		};
+		register_shrinker(&cache_shrinker);
+	])
+
+	ZFS_LINUX_TEST_SRC([shrinker_cb_shrink_control], [
+		#include <linux/mm.h>
+		int shrinker_cb(struct shrinker *shrink,
+		    struct shrink_control *sc) { return 0; }
+	],[
+		struct shrinker cache_shrinker = {
+			.shrink = shrinker_cb,
+			.seeks = DEFAULT_SEEKS,
+		};
+		register_shrinker(&cache_shrinker);
+	])
+
+	ZFS_LINUX_TEST_SRC([shrinker_cb_shrink_control_split], [
+		#include <linux/mm.h>
+		unsigned long shrinker_cb(struct shrinker *shrink,
+		    struct shrink_control *sc) { return 0; }
+	],[
+		struct shrinker cache_shrinker = {
+			.count_objects = shrinker_cb,
+			.scan_objects = shrinker_cb,
+			.seeks = DEFAULT_SEEKS,
+		};
+		register_shrinker(&cache_shrinker);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SHRINKER_CALLBACK],[
+	dnl #
+	dnl # 2.6.23 to 2.6.34 API change
+	dnl # ->shrink(int nr_to_scan, gfp_t gfp_mask)
+	dnl #
+	AC_MSG_CHECKING([whether old 2-argument shrinker exists])
+	ZFS_LINUX_TEST_RESULT([shrinker_cb_2arg], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_2ARGS_OLD_SHRINKER_CALLBACK, 1,
-			[old shrinker callback wants 2 args])
+		    [old shrinker callback wants 2 args])
 	],[
 		AC_MSG_RESULT(no)
+
 		dnl #
 		dnl # 2.6.35 - 2.6.39 API change
 		dnl # ->shrink(struct shrinker *,
 		dnl #          int nr_to_scan, gfp_t gfp_mask)
 		dnl #
 		AC_MSG_CHECKING([whether old 3-argument shrinker exists])
-		ZFS_LINUX_TRY_COMPILE([
+		ZFS_LINUX_TEST_RESULT([shrinker_cb_3arg], [
-			#include <linux/mm.h>
-
-			int shrinker_cb(struct shrinker *shrink, int nr_to_scan,
-					gfp_t gfp_mask) {
-				return 0;
-			}
-		],[
-			struct shrinker cache_shrinker = {
-				.shrink = shrinker_cb,
-				.seeks = DEFAULT_SEEKS,
-			};
-			register_shrinker(&cache_shrinker);
-		],[
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1,
 				[old shrinker callback wants 3 args])
 		],[
 			AC_MSG_RESULT(no)
+
 			dnl #
 			dnl # 3.0 - 3.11 API change
 			dnl # ->shrink(struct shrinker *,
 			dnl #          struct shrink_control *sc)
 			dnl #
 			AC_MSG_CHECKING(
-				[whether new 2-argument shrinker exists])
+			    [whether new 2-argument shrinker exists])
-			ZFS_LINUX_TRY_COMPILE([
+			ZFS_LINUX_TEST_RESULT([shrinker_cb_shrink_control], [
-				#include <linux/mm.h>
-
-				int shrinker_cb(struct shrinker *shrink,
-						struct shrink_control *sc) {
-					return 0;
-				}
-			],[
-				struct shrinker cache_shrinker = {
-					.shrink = shrinker_cb,
-					.seeks = DEFAULT_SEEKS,
-				};
-				register_shrinker(&cache_shrinker);
-			],[
 				AC_MSG_RESULT(yes)
 				AC_DEFINE(HAVE_2ARGS_NEW_SHRINKER_CALLBACK, 1,
 					[new shrinker callback wants 2 args])
 			],[
 				AC_MSG_RESULT(no)
+
 				dnl #
 				dnl # 3.12 API change,
 				dnl # ->shrink() is logically split in to
@@ -217,52 +245,61 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINKER_CALLBACK],[
 				dnl #
 				AC_MSG_CHECKING(
 				    [whether ->count_objects callback exists])
-				ZFS_LINUX_TRY_COMPILE([
+				ZFS_LINUX_TEST_RESULT(
-					#include <linux/mm.h>
+				    [shrinker_cb_shrink_control_split], [
-
-					unsigned long shrinker_cb(
-						struct shrinker *shrink,
-						struct shrink_control *sc) {
-						return 0;
-					}
-				],[
-					struct shrinker cache_shrinker = {
-						.count_objects = shrinker_cb,
-						.scan_objects = shrinker_cb,
-						.seeks = DEFAULT_SEEKS,
-					};
-					register_shrinker(&cache_shrinker);
-				],[
 					AC_MSG_RESULT(yes)
 					AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK,
 						1, [->count_objects exists])
 				],[
-					AC_MSG_ERROR(error)
+					ZFS_LINUX_TEST_ERROR([shrinker])
 				])
 			])
 		])
 	])
-	EXTRA_KCFLAGS="$tmp_flags"
 ])
 
 dnl #
 dnl # 2.6.39 API change,
 dnl # Shrinker adjust to use common shrink_control structure.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_STRUCT], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINK_CONTROL_STRUCT], [
-	AC_MSG_CHECKING([whether struct shrink_control exists])
+	ZFS_LINUX_TEST_SRC([shrink_control_struct], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/mm.h>
 	],[
 		struct shrink_control sc __attribute__ ((unused));
 
 		sc.nr_to_scan = 0;
 		sc.gfp_mask = GFP_KERNEL;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_STRUCT], [
+	AC_MSG_CHECKING([whether struct shrink_control exists])
+	ZFS_LINUX_TEST_RESULT([shrink_control_struct], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SHRINK_CONTROL_STRUCT, 1,
-			[struct shrink_control exists])
+		    [struct shrink_control exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINKER], [
+	ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_SHRINK
+	ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_INSTANCES_LIST_HEAD
+	ZFS_AC_KERNEL_SRC_NR_CACHED_OBJECTS
+	ZFS_AC_KERNEL_SRC_FREE_CACHED_OBJECTS
+	ZFS_AC_KERNEL_SRC_SHRINK_CONTROL_HAS_NID
+	ZFS_AC_KERNEL_SRC_SHRINKER_CALLBACK
+	ZFS_AC_KERNEL_SRC_SHRINK_CONTROL_STRUCT
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SHRINKER], [
+	ZFS_AC_KERNEL_SUPER_BLOCK_S_SHRINK
+	ZFS_AC_KERNEL_SUPER_BLOCK_S_INSTANCES_LIST_HEAD
+	ZFS_AC_KERNEL_NR_CACHED_OBJECTS
+	ZFS_AC_KERNEL_FREE_CACHED_OBJECTS
+	ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID
+	ZFS_AC_KERNEL_SHRINKER_CALLBACK
+	ZFS_AC_KERNEL_SHRINK_CONTROL_STRUCT
+])

config/kernel-submit_bio.m4

@@ -3,15 +3,19 @@ dnl # 4.8 API change
 dnl # The rw argument has been removed from submit_bio/submit_bio_wait.
 dnl # Callers are now expected to set bio->bi_rw instead of passing it in.
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SUBMIT_BIO], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SUBMIT_BIO], [
-	AC_MSG_CHECKING([whether submit_bio() wants 1 arg])
+	ZFS_LINUX_TEST_SRC([submit_bio], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/bio.h>
 	],[
 		blk_qc_t blk_qc;
 		struct bio *bio = NULL;
 		blk_qc = submit_bio(bio);
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SUBMIT_BIO], [
+	AC_MSG_CHECKING([whether submit_bio() wants 1 arg])
+	ZFS_LINUX_TEST_RESULT([submit_bio], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_1ARG_SUBMIT_BIO, 1, [submit_bio() wants 1 arg])
 	],[

config/kernel-super-userns.m4

@@ -3,15 +3,19 @@ dnl # 4.8 API change
 dnl # struct user_namespace was added to struct super_block as
 dnl # super->s_user_ns member
 dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SUPER_USER_NS], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SUPER_USER_NS], [
-	AC_MSG_CHECKING([whether super_block->s_user_ns exists])
+	ZFS_LINUX_TEST_SRC([super_user_ns], [
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
 		#include <linux/user_namespace.h>
-	],[
+	], [
 		struct super_block super;
 		super.s_user_ns = (struct user_namespace *)NULL;
-	],[
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SUPER_USER_NS], [
+	AC_MSG_CHECKING([whether super_block->s_user_ns exists])
+	ZFS_LINUX_TEST_RESULT([super_user_ns], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SUPER_USER_NS, 1,
 		    [super_block->s_user_ns exists])

config/kernel-timer.m4

@@ -8,13 +8,9 @@ dnl # kernels that support the new timer_list.func signature.
 dnl #
 dnl # Also check for the existence of flags in struct timer_list, they were
 dnl # added in 4.1-rc8 via 0eeda71bc30d.
-
+dnl #
-AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_TIMER_SETUP], [
-	AC_MSG_CHECKING([whether timer_setup() is available])
+	ZFS_LINUX_TEST_SRC([timer_setup], [
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-Werror"
-
-	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/timer.h>
 
 		struct my_task_timer {
@@ -24,13 +20,34 @@ AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
 
 		void task_expire(struct timer_list *tl)
 		{
-			struct my_task_timer *task_timer = from_timer(task_timer, tl, timer);
+			struct my_task_timer *task_timer =
+			    from_timer(task_timer, tl, timer);
 			task_timer->data = 42;
 		}
 	],[
 		struct my_task_timer task_timer;
 		timer_setup(&task_timer.timer, task_expire, 0);
+	])
+
+	ZFS_LINUX_TEST_SRC([timer_list_function], [
+		#include <linux/timer.h>
+		void task_expire(struct timer_list *tl) {}
 	],[
+		struct timer_list tl;
+		tl.function = task_expire;
+	])
+
+	ZFS_LINUX_TEST_SRC([timer_list_flags], [
+		#include <linux/timer.h>
+	],[
+		struct timer_list tl;
+		tl.flags = 2;
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
+	AC_MSG_CHECKING([whether timer_setup() is available])
+	ZFS_LINUX_TEST_RESULT([timer_setup], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KERNEL_TIMER_SETUP, 1,
 		    [timer_setup() is available])
@@ -39,14 +56,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
 	])
 
 	AC_MSG_CHECKING([whether timer function expects timer_list])
-
+	ZFS_LINUX_TEST_RESULT([timer_list_function], [
-	ZFS_LINUX_TRY_COMPILE([
-		#include <linux/timer.h>
-		void task_expire(struct timer_list *tl) {}
-	],[
-		struct timer_list tl;
-		tl.function = task_expire;
-	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST, 1,
 		    [timer_list.function gets a timer_list])
@@ -55,19 +65,11 @@ AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
 	])
 
 	AC_MSG_CHECKING([whether struct timer_list has flags])
-
+	ZFS_LINUX_TEST_RESULT([timer_list_flags], [
-	ZFS_LINUX_TRY_COMPILE([
-		#include <linux/timer.h>
-	],[
-		struct timer_list tl;
-		tl.flags = 2;
-	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_KERNEL_TIMER_LIST_FLAGS, 1,
 		    [struct timer_list has a flags member])
 	],[
 		AC_MSG_RESULT(no)
 	])
-
-	EXTRA_KCFLAGS="$tmp_flags"
 ])