Merge tag 'upstream/0.6.5.7'

[mirror_zfs-debian.git] / config / kernel-lookup-nameidata.m4

diff --git a/config/kernel-lookup-nameidata.m4 b/config/kernel-lookup-nameidata.m4
index 5e30be4335bf44574dd0cac7294b7d5d84265bbe..43f5fb4cbc7bf9ee97cf02ab43e5963e72fa3c64 100644 (file)
--- a/config/kernel-lookup-nameidata.m4
+++ b/config/kernel-lookup-nameidata.m4
@@ -2,19 +2,23 @@ dnl #
 dnl # 3.6 API change
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [
-       AC_MSG_CHECKING([whether iops->lookup() takes struct nameidata])
+       AC_MSG_CHECKING([whether iops->lookup() passes nameidata])
        ZFS_LINUX_TRY_COMPILE([
                #include <linux/fs.h>
-       ],[
-               struct dentry * (*inode_lookup) (struct inode *,struct dentry *,
-                                    struct nameidata *) = NULL;
-               struct inode_operations iops __attribute__ ((unused)) = {
-                       .lookup         = inode_lookup,
+
+               struct dentry *inode_lookup(struct inode *inode,
+                   struct dentry *dentry, struct nameidata *nidata)
+                   { return NULL; }
+
+               static const struct inode_operations iops
+                   __attribute__ ((unused)) = {
+                       .lookup = inode_lookup,
                };
+       ],[
        ],[
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_LOOKUP_NAMEIDATA, 1,
-                         [iops->lookup() operation takes nameidata])
+                         [iops->lookup() passes nameidata])
        ],[
                AC_MSG_RESULT(no)
        ])