X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fkernel-fallocate.m4;h=5509064725e00d3a0ca3c45824295fb26a1ef1fd;hb=1a33036df9de8f95aea38ec0d9e483106d1abaa4;hp=6ac5ae65c7644f3202ae4fa96f98d00ccbeb5a90;hpb=0a6b03d3b87cf17ac6159395df93ba3fcfdddc45;p=zfs.git

diff --git a/config/kernel-fallocate.m4 b/config/kernel-fallocate.m4
index 6ac5ae6..5509064 100644
--- a/config/kernel-fallocate.m4
+++ b/config/kernel-fallocate.m4
@@ -5,12 +5,16 @@ AC_DEFUN([ZFS_AC_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 fops __attribute__ ((unused)) = {
-			.fallocate = fallocate,
+
+		long test_fallocate(struct file *file, int mode,
+		    loff_t offset, loff_t len) { return 0; }
+
+		static const struct file_operations
+		    fops __attribute__ ((unused)) = {
+			.fallocate = test_fallocate,
 		};
 	],[
+	],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
 	],[
@@ -25,34 +29,18 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_FALLOCATE], [
 	AC_MSG_CHECKING([whether iops->fallocate() exists])
 	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
-	],[
-		long (*fallocate) (struct inode *, int, loff_t, loff_t) = NULL;
-		struct inode_operations fops __attribute__ ((unused)) = {
-			.fallocate = fallocate,
-		};
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_FALLOCATE, 1, [fops->fallocate() exists])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
 
-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,
+		long test_fallocate(struct inode *inode, int mode,
+		    loff_t offset, loff_t len) { return 0; }
+
+		static const struct inode_operations
+		    fops __attribute__ ((unused)) = {
+			.fallocate = test_fallocate,
 		};
 	],[
+	],[
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
+		AC_DEFINE(HAVE_INODE_FALLOCATE, 1, [fops->fallocate() exists])
 	],[
 		AC_MSG_RESULT(no)
 	])
@@ -65,5 +53,4 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [
 	ZFS_AC_KERNEL_FILE_FALLOCATE
 	ZFS_AC_KERNEL_INODE_FALLOCATE
-	ZFS_AC_PAX_KERNEL_FILE_FALLOCATE
 ])