Permalink
Browse files

Linux 3.6-rc1 Compatibility: Use .mkdir instead of .create in 3.3 com…

…patibility check

Linux 3.6 modifies inode_operations->create's function prototype. This
causes an autotools Linux 3.3. compatibility check for a function
prototype change in create, mkdir and mknode to fail. The check that
Since mkdir and mknode are unchanged, we modify the check to examine it
instead.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
  • Loading branch information...
1 parent a344add commit 5406b06ffc8a5125850776f64f2d476606184b84 @ryao ryao committed with Aug 16, 2012
@@ -6,19 +6,18 @@ 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 in to three seperate checks.
dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CREATE_UMODE_T], [
+AC_DEFUN([ZFS_AC_KERNEL_MKDIR_UMODE_T], [
AC_MSG_CHECKING([whether iops->create()/mkdir()/mknod() take umode_t])
ZFS_LINUX_TRY_COMPILE([
#include <linux/fs.h>
],[
- int (*create) (struct inode *, struct dentry *, umode_t,
- struct nameidata *) = NULL;
+ int (*mkdir) (struct inode *,struct dentry *,umode_t) = NULL;
struct inode_operations iops __attribute__ ((unused)) = {
- .create = create,
+ .mkdir = mkdir,
};
],[
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_CREATE_UMODE_T, 1,
+ AC_DEFINE(HAVE_MKDIR_UMODE_T, 1,
[iops->create()/mkdir()/mknod() take umode_t])
],[
AC_MSG_RESULT(no)
View
@@ -51,7 +51,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_FALLOCATE
ZFS_AC_KERNEL_LOOKUP_NAMEIDATA
ZFS_AC_KERNEL_TRUNCATE_RANGE
- ZFS_AC_KERNEL_CREATE_UMODE_T
+ ZFS_AC_KERNEL_MKDIR_UMODE_T
ZFS_AC_KERNEL_AUTOMOUNT
ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE
ZFS_AC_KERNEL_COMMIT_METADATA
@@ -115,7 +115,7 @@ set_nlink(struct inode *inode, unsigned int nlink)
* umode_t type rather than an int. To cleanly handle both definitions
* the zpl_umode_t type is introduced and set accordingly.
*/
-#ifdef HAVE_CREATE_UMODE_T
+#ifdef HAVE_MKDIR_UMODE_T
typedef umode_t zpl_umode_t;
#else
typedef int zpl_umode_t;

0 comments on commit 5406b06

Please sign in to comment.