From b39d3b9f7be925ba9314c336099f31f508e1d940 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 30 Apr 2012 12:01:49 -0700 Subject: Linux 3.3 compat, iops->create()/mkdir()/mknod() The mode argument of iops->create()/mkdir()/mknod() was changed from an 'int' to a 'umode_t'. To prevent a compiler warning an autoconf check was added to detect the API change and then correctly set a zpl_umode_t typedef. There is no functional change. Signed-off-by: Brian Behlendorf Closes #701 --- module/zfs/zpl_ctldir.c | 2 +- module/zfs/zpl_inode.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'module') diff --git a/module/zfs/zpl_ctldir.c b/module/zfs/zpl_ctldir.c index 6c742c9e8..c680e5443 100644 --- a/module/zfs/zpl_ctldir.c +++ b/module/zfs/zpl_ctldir.c @@ -300,7 +300,7 @@ zpl_snapdir_rmdir(struct inode *dip, struct dentry *dentry) } static int -zpl_snapdir_mkdir(struct inode *dip, struct dentry *dentry, int mode) +zpl_snapdir_mkdir(struct inode *dip, struct dentry *dentry, zpl_umode_t mode) { cred_t *cr = CRED(); vattr_t *vap; diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c index d9b918b43..1f6169b75 100644 --- a/module/zfs/zpl_inode.c +++ b/module/zfs/zpl_inode.c @@ -54,7 +54,7 @@ zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) void zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry, - mode_t mode, cred_t *cr) + zpl_umode_t mode, cred_t *cr) { vap->va_mask = ATTR_MODE; vap->va_mode = mode; @@ -71,7 +71,7 @@ zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry, } static int -zpl_create(struct inode *dir, struct dentry *dentry, int mode, +zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode, struct nameidata *nd) { cred_t *cr = CRED(); @@ -93,7 +93,8 @@ zpl_create(struct inode *dir, struct dentry *dentry, int mode, } static int -zpl_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev) +zpl_mknod(struct inode *dir, struct dentry *dentry, zpl_umode_t mode, + dev_t rdev) { cred_t *cr = CRED(); struct inode *ip; @@ -136,7 +137,7 @@ zpl_unlink(struct inode *dir, struct dentry *dentry) } static int -zpl_mkdir(struct inode *dir, struct dentry *dentry, int mode) +zpl_mkdir(struct inode *dir, struct dentry *dentry, zpl_umode_t mode) { cred_t *cr = CRED(); vattr_t *vap; -- cgit v1.2.3