c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Linux 3.6 compat, iops->mkdir()

Browse Source 
Use .mkdir instead of .create in 3.3 compatibility 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. Since mkdir and mknode
are unchanged, we modify the check to examine it instead.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #873
This commit is contained in:
Richard Yao 2012-08-16 19:31:54 -04:00 committed by Brian Behlendorf
parent 558ef6d080
commit 95f5c63b47
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/kernel-create-umode-t.m4 → config/kernel-mkdir-umode-t.m4
View File

@ -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 # some distribution doesn't backport the whole thing this could be
dnl # broken apart in to three seperate checks. dnl # broken apart in to three seperate checks.
dnl # 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]) AC_MSG_CHECKING([whether iops->create()/mkdir()/mknod() take umode_t])
ZFS_LINUX_TRY_COMPILE([ ZFS_LINUX_TRY_COMPILE([
#include <linux/fs.h> #include <linux/fs.h>
],[ ],[
int (*create) (struct inode *, struct dentry *, umode_t, int (*mkdir) (struct inode *,struct dentry *,umode_t) = NULL;
struct nameidata *) = NULL;
struct inode_operations iops __attribute__ ((unused)) = { struct inode_operations iops __attribute__ ((unused)) = {
.create = create, .mkdir = mkdir,
}; };
],[ ],[
AC_MSG_RESULT(yes) 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]) [iops->create()/mkdir()/mknod() take umode_t])
],[ ],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)

2
config/kernel.m4
View File

@ -49,10 +49,10 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_NR_CACHED_OBJECTS ZFS_AC_KERNEL_NR_CACHED_OBJECTS
ZFS_AC_KERNEL_FREE_CACHED_OBJECTS ZFS_AC_KERNEL_FREE_CACHED_OBJECTS
ZFS_AC_KERNEL_FALLOCATE ZFS_AC_KERNEL_FALLOCATE
ZFS_AC_KERNEL_MKDIR_UMODE_T
ZFS_AC_KERNEL_LOOKUP_NAMEIDATA ZFS_AC_KERNEL_LOOKUP_NAMEIDATA
ZFS_AC_KERNEL_CREATE_NAMEIDATA ZFS_AC_KERNEL_CREATE_NAMEIDATA
ZFS_AC_KERNEL_TRUNCATE_RANGE ZFS_AC_KERNEL_TRUNCATE_RANGE
ZFS_AC_KERNEL_CREATE_UMODE_T
ZFS_AC_KERNEL_AUTOMOUNT ZFS_AC_KERNEL_AUTOMOUNT
ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE
ZFS_AC_KERNEL_COMMIT_METADATA ZFS_AC_KERNEL_COMMIT_METADATA

2
include/linux/vfs_compat.h
View File

@ -115,7 +115,7 @@ set_nlink(struct inode *inode, unsigned int nlink)
* umode_t type rather than an int. To cleanly handle both definitions * umode_t type rather than an int. To cleanly handle both definitions
* the zpl_umode_t type is introduced and set accordingly. * 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; typedef umode_t zpl_umode_t;
#else #else
typedef int zpl_umode_t; typedef int zpl_umode_t;