diff options
author | Yuxuan Shui <[email protected]> | 2012-10-12 22:41:06 +0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2012-10-14 13:06:54 -0700 |
commit | 8f195a908ffaa8faf8f4c8a0e701e44ae3859e33 (patch) | |
tree | 48ade7ec19cb9689b2d7c5e508626cd29df09272 /config | |
parent | 3c203610756f98f275c7c9f731d67a38b1111509 (diff) |
Linux 3.6 compat, iops->lookup()
As of Linux commit 00cd8dd3bf95f2cc8435b4cac01d9995635c6d0b the
struct nameidata is no longer passed to iops->lookup. Instead
only the inamedata->flags are passed.
ZFS like almost all Linux fileystems never made use of this so
only the prototype needs to be wrapped for compatibility.
Signed-off-by: Yuxuan Shui <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #873
Diffstat (limited to 'config')
-rw-r--r-- | config/kernel-lookup-nameidata.m4 | 21 | ||||
-rw-r--r-- | config/kernel.m4 | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/config/kernel-lookup-nameidata.m4 b/config/kernel-lookup-nameidata.m4 new file mode 100644 index 000000000..5e30be433 --- /dev/null +++ b/config/kernel-lookup-nameidata.m4 @@ -0,0 +1,21 @@ +dnl # +dnl # 3.6 API change +dnl # +AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [ + AC_MSG_CHECKING([whether iops->lookup() takes struct 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, + }; + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_LOOKUP_NAMEIDATA, 1, + [iops->lookup() operation takes nameidata]) + ],[ + AC_MSG_RESULT(no) + ]) +]) diff --git a/config/kernel.m4 b/config/kernel.m4 index 3a144a337..8d8cd6b48 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -49,6 +49,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_NR_CACHED_OBJECTS ZFS_AC_KERNEL_FREE_CACHED_OBJECTS ZFS_AC_KERNEL_FALLOCATE + ZFS_AC_KERNEL_LOOKUP_NAMEIDATA ZFS_AC_KERNEL_TRUNCATE_RANGE ZFS_AC_KERNEL_CREATE_UMODE_T ZFS_AC_KERNEL_AUTOMOUNT |