switch posix_acl_equiv_mode() to umode_t *

... so that &inode->i_mode could be passed to it

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index ad734e3..9a1d426 100644 (file)
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -319,7 +319,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;
                if (acl) {
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;
                if (acl) {

-                       mode_t mode = inode->i_mode;
+                       umode_t mode = inode->i_mode;

                        retval = posix_acl_equiv_mode(acl, &mode);
                        if (retval < 0)
                                goto err_out;
                        retval = posix_acl_equiv_mode(acl, &mode);
                        if (retval < 0)
                                goto err_out;

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 5908614..4cc5c01 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -111,7 +111,6 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,
        int ret, size = 0;
        const char *name;
        char *value = NULL;
        int ret, size = 0;
        const char *name;
        char *value = NULL;

-       mode_t mode;

 
        if (acl) {
                ret = posix_acl_valid(acl);
 
        if (acl) {
                ret = posix_acl_valid(acl);


@@ -122,13 +121,11 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,
 
        switch (type) {
        case ACL_TYPE_ACCESS:
 
        switch (type) {
        case ACL_TYPE_ACCESS:

-               mode = inode->i_mode;

                name = POSIX_ACL_XATTR_ACCESS;
                if (acl) {
                name = POSIX_ACL_XATTR_ACCESS;
                if (acl) {

-                       ret = posix_acl_equiv_mode(acl, &mode);
+                       ret = posix_acl_equiv_mode(acl, &inode->i_mode);

                        if (ret < 0)
                                return ret;
                        if (ret < 0)
                                return ret;

-                       inode->i_mode = mode;

                }
                ret = 0;
                break;
                }
                ret = 0;
                break;

diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index 0ce7404..35d6a3c 100644 (file)
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -194,12 +194,10 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
                case ACL_TYPE_ACCESS:
                        name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;
                        if (acl) {
                case ACL_TYPE_ACCESS:
                        name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;
                        if (acl) {

-                               mode_t mode = inode->i_mode;
-                               error = posix_acl_equiv_mode(acl, &mode);
+                               error = posix_acl_equiv_mode(acl, &inode->i_mode);

                                if (error < 0)
                                        return error;
                                else {
                                if (error < 0)
                                        return error;
                                else {

-                                       inode->i_mode = mode;

                                        inode->i_ctime = CURRENT_TIME_SEC;
                                        mark_inode_dirty(inode);
                                        if (error == 0)
                                        inode->i_ctime = CURRENT_TIME_SEC;
                                        mark_inode_dirty(inode);
                                        if (error == 0)

diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index 74a3c64..3091f62 100644 (file)
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -199,12 +199,10 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,
                case ACL_TYPE_ACCESS:
                        name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;
                        if (acl) {
                case ACL_TYPE_ACCESS:
                        name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;
                        if (acl) {

-                               mode_t mode = inode->i_mode;
-                               error = posix_acl_equiv_mode(acl, &mode);
+                               error = posix_acl_equiv_mode(acl, &inode->i_mode);

                                if (error < 0)
                                        return error;
                                else {
                                if (error < 0)
                                        return error;
                                else {

-                                       inode->i_mode = mode;

                                        inode->i_ctime = CURRENT_TIME_SEC;
                                        ext3_mark_inode_dirty(handle, inode);
                                        if (error == 0)
                                        inode->i_ctime = CURRENT_TIME_SEC;
                                        ext3_mark_inode_dirty(handle, inode);
                                        if (error == 0)

diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index 74e469c..a5c29bb 100644 (file)
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -198,12 +198,10 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type,
        case ACL_TYPE_ACCESS:
                name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS;
                if (acl) {
        case ACL_TYPE_ACCESS:
                name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS;
                if (acl) {

-                       mode_t mode = inode->i_mode;
-                       error = posix_acl_equiv_mode(acl, &mode);
+                       error = posix_acl_equiv_mode(acl, &inode->i_mode);

                        if (error < 0)
                                return error;
                        else {
                        if (error < 0)
                                return error;
                        else {

-                               inode->i_mode = mode;

                                inode->i_ctime = ext4_current_time(inode);
                                ext4_mark_inode_dirty(handle, inode);
                                if (error == 0)
                                inode->i_ctime = ext4_current_time(inode);
                                ext4_mark_inode_dirty(handle, inode);
                                if (error == 0)

diff --git a/fs/generic_acl.c b/fs/generic_acl.c
index 2dd434d..d0dddac 100644 (file)
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
@@ -82,18 +82,14 @@ generic_acl_set(struct dentry *dentry, const char *name, const void *value,
                        return PTR_ERR(acl);
        }
        if (acl) {
                        return PTR_ERR(acl);
        }
        if (acl) {

-               mode_t mode;
-

                error = posix_acl_valid(acl);
                if (error)
                        goto failed;
                switch (type) {
                case ACL_TYPE_ACCESS:
                error = posix_acl_valid(acl);
                if (error)
                        goto failed;
                switch (type) {
                case ACL_TYPE_ACCESS:

-                       mode = inode->i_mode;
-                       error = posix_acl_equiv_mode(acl, &mode);
+                       error = posix_acl_equiv_mode(acl, &inode->i_mode);

                        if (error < 0)
                                goto failed;
                        if (error < 0)
                                goto failed;

-                       inode->i_mode = mode;

                        inode->i_ctime = CURRENT_TIME;
                        if (error == 0) {
                                posix_acl_release(acl);
                        inode->i_ctime = CURRENT_TIME;
                        if (error == 0) {
                                posix_acl_release(acl);

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 0ac3c53..34501b6 100644 (file)
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -276,7 +276,7 @@ static int gfs2_xattr_system_set(struct dentry *dentry, const char *name,
                goto out_release;
 
        if (type == ACL_TYPE_ACCESS) {
                goto out_release;
 
        if (type == ACL_TYPE_ACCESS) {

-               mode_t mode = inode->i_mode;
+               umode_t mode = inode->i_mode;

                error = posix_acl_equiv_mode(acl, &mode);
 
                if (error <= 0) {
                error = posix_acl_equiv_mode(acl, &mode);
 
                if (error <= 0) {

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 6372a84..926d020 100644 (file)
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -227,7 +227,7 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
        case ACL_TYPE_ACCESS:
                xprefix = JFFS2_XPREFIX_ACL_ACCESS;
                if (acl) {
        case ACL_TYPE_ACCESS:
                xprefix = JFFS2_XPREFIX_ACL_ACCESS;
                if (acl) {

-                       mode_t mode = inode->i_mode;
+                       umode_t mode = inode->i_mode;

                        rc = posix_acl_equiv_mode(acl, &mode);
                        if (rc < 0)
                                return rc;
                        rc = posix_acl_equiv_mode(acl, &mode);
                        if (rc < 0)
                                return rc;

diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 24838f1..e87fede 100644 (file)
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -693,8 +693,7 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
                        return rc;
                }
                if (acl) {
                        return rc;
                }
                if (acl) {

-                       mode_t mode = inode->i_mode;
-                       rc = posix_acl_equiv_mode(acl, &mode);
+                       rc = posix_acl_equiv_mode(acl, &inode->i_mode);

                        posix_acl_release(acl);
                        if (rc < 0) {
                                printk(KERN_ERR
                        posix_acl_release(acl);
                        if (rc < 0) {
                                printk(KERN_ERR


@@ -702,7 +701,6 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
                                       rc);
                                return rc;
                        }
                                       rc);
                                return rc;
                        }

-                       inode->i_mode = mode;

                        mark_inode_dirty(inode);
                }
                /*
                        mark_inode_dirty(inode);
                }
                /*

diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index fbafc6e..a721907 100644 (file)
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
@@ -247,7 +247,7 @@ static int ocfs2_set_acl(handle_t *handle,
        case ACL_TYPE_ACCESS:
                name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS;
                if (acl) {
        case ACL_TYPE_ACCESS:
                name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS;
                if (acl) {

-                       mode_t mode = inode->i_mode;
+                       umode_t mode = inode->i_mode;

                        ret = posix_acl_equiv_mode(acl, &mode);
                        if (ret < 0)
                                return ret;
                        ret = posix_acl_equiv_mode(acl, &mode);
                        if (ret < 0)
                                return ret;

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index f0a017e..3d943be 100644 (file)
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -149,10 +149,10 @@ posix_acl_valid(const struct posix_acl *acl)
  * file mode permission bits, or else 1. Returns -E... on error.
  */
 int
  * file mode permission bits, or else 1. Returns -E... on error.
  */
 int

-posix_acl_equiv_mode(const struct posix_acl *acl, mode_t *mode_p)
+posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)

 {
        const struct posix_acl_entry *pa, *pe;
 {
        const struct posix_acl_entry *pa, *pe;

-       mode_t mode = 0;
+       umode_t mode = 0;

        int not_equiv = 0;
 
        FOREACH_ACL_ENTRY(pa, acl, pe) {
        int not_equiv = 0;
 
        FOREACH_ACL_ENTRY(pa, acl, pe) {

diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
index 89ebc77..6da0396 100644 (file)
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
@@ -272,12 +272,10 @@ reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;
                if (acl) {
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;
                if (acl) {

-                       mode_t mode = inode->i_mode;
-                       error = posix_acl_equiv_mode(acl, &mode);
+                       error = posix_acl_equiv_mode(acl, &inode->i_mode);

                        if (error < 0)
                                return error;
                        else {
                        if (error < 0)
                                return error;
                        else {

-                               inode->i_mode = mode;

                                if (error == 0)
                                        acl = NULL;
                        }
                                if (error == 0)
                                        acl = NULL;
                        }

diff --git a/fs/xfs/linux-2.6/xfs_acl.c b/fs/xfs/linux-2.6/xfs_acl.c
index bb85500..b6c4b37 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_acl.c
+++ b/fs/xfs/linux-2.6/xfs_acl.c
@@ -381,7 +381,7 @@ xfs_xattr_acl_set(struct dentry *dentry, const char *name,
                goto out_release;
 
        if (type == ACL_TYPE_ACCESS) {
                goto out_release;
 
        if (type == ACL_TYPE_ACCESS) {

-               mode_t mode = inode->i_mode;
+               umode_t mode = inode->i_mode;

                error = posix_acl_equiv_mode(acl, &mode);
 
                if (error <= 0) {
                error = posix_acl_equiv_mode(acl, &mode);
 
                if (error <= 0) {

diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index bd8d005..529c32a 100644 (file)
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -76,7 +76,7 @@ extern struct posix_acl *posix_acl_alloc(int, gfp_t);
 extern int posix_acl_valid(const struct posix_acl *);
 extern int posix_acl_permission(struct inode *, const struct posix_acl *, int);
 extern struct posix_acl *posix_acl_from_mode(mode_t, gfp_t);
 extern int posix_acl_valid(const struct posix_acl *);
 extern int posix_acl_permission(struct inode *, const struct posix_acl *, int);
 extern struct posix_acl *posix_acl_from_mode(mode_t, gfp_t);

-extern int posix_acl_equiv_mode(const struct posix_acl *, mode_t *);
+extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *);

 extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *);
 extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t);
 
 extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *);
 extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t);