Linux: use filemap_invalidate_lock (add test)

Signed-off-by: Pavel Snajdr <[email protected]>

Author: snajpa

config/kernel-filemap-invalidate-lock.m4

@@ -0,0 +1,23 @@
+dnl #
+dnl # Linux 3.2 API change
+dnl # set_nlink()
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_FILEMAP_INVALIDATE_LOCK], [
+	ZFS_LINUX_TEST_SRC([set_nlink], [
+		#include <linux/fs.h>
+	],[
+		struct address_space mapping;
+		filemap_invalidate_lock(&mapping);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_FILEMAP_INVALIDATE_LOCK], [
+	AC_MSG_CHECKING([whether filemap_invalidate_lock() is available])
+	ZFS_LINUX_TEST_RESULT([filemap_invalidate_lock], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_FILEMAP_INVALIDATE_LOCK, 1,
+		    [__assign_str() has one arg])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])

config/kernel.m4

@@ -129,6 +129,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_MM_PAGE_SIZE
 	ZFS_AC_KERNEL_SRC_MM_PAGE_MAPPING
 	ZFS_AC_KERNEL_SRC_FILE
+	ZFS_AC_KERNEL_SRC_FILEMAP_INVALIDATE_LOCK
 	case "$host_cpu" in
 		powerpc*)
 			ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE
@@ -242,6 +243,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_MM_PAGE_MAPPING
 	ZFS_AC_KERNEL_1ARG_ASSIGN_STR
 	ZFS_AC_KERNEL_FILE
+	ZFS_AC_KERNEL_FILEMAP_INVALIDATE_LOCK
 	case "$host_cpu" in
 		powerpc*)
 			ZFS_AC_KERNEL_CPU_HAS_FEATURE

module/os/linux/zfs/zfs_znode_os.c

@@ -1761,7 +1761,9 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log)
 	    sizeof (mode))) != 0)
 		return (error);
 
+#ifdef HAVE_FILEMAP_INVALIDATE_LOCK
 	filemap_invalidate_lock(ZTOI(zp)->i_mapping);
+#endif
 	if (off > zp->z_size) {
 		error =  zfs_extend(zp, off+len);
 		if (error == 0 && log)
@@ -1806,7 +1808,9 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log)
 out:
 	if (!len)
 		truncate_setsize(ZTOI(zp), off);
+#ifdef HAVE_FILEMAP_INVALIDATE_LOCK
 	filemap_invalidate_unlock(ZTOI(zp)->i_mapping);
+#endif
 	return (error);
 }