kill boilerplates around posix_acl_create_masq()

[pandora-kernel.git] / fs / ocfs2 / acl.c

diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index e913ad1..480200e 100644 (file)
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
@@ -290,16 +290,13 @@ static int ocfs2_set_acl(handle_t *handle,
        return ret;
 }
 
-int ocfs2_check_acl(struct inode *inode, int mask, unsigned int flags)
+int ocfs2_check_acl(struct inode *inode, int mask)
 {
        struct ocfs2_super *osb;
        struct buffer_head *di_bh = NULL;
        struct posix_acl *acl;
        int ret = -EAGAIN;
 
-       if (flags & IPERM_FLAG_RCU)
-               return -ECHILD;
-
        osb = OCFS2_SB(inode->i_sb);
        if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
                return ret;
@@ -330,7 +327,7 @@ int ocfs2_check_acl(struct inode *inode, int mask, unsigned int flags)
 int ocfs2_acl_chmod(struct inode *inode)
 {
        struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
-       struct posix_acl *acl, *clone;
+       struct posix_acl *acl;
        int ret;
 
        if (S_ISLNK(inode->i_mode))
@@ -342,15 +339,12 @@ int ocfs2_acl_chmod(struct inode *inode)
        acl = ocfs2_get_acl(inode, ACL_TYPE_ACCESS);
        if (IS_ERR(acl) || !acl)
                return PTR_ERR(acl);
-       clone = posix_acl_clone(acl, GFP_KERNEL);
+       ret = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
+       if (ret)
+               return ret;
+       ret = ocfs2_set_acl(NULL, inode, NULL, ACL_TYPE_ACCESS,
+                           acl, NULL, NULL);
        posix_acl_release(acl);
-       if (!clone)
-               return -ENOMEM;
-       ret = posix_acl_chmod_masq(clone, inode->i_mode);
-       if (!ret)
-               ret = ocfs2_set_acl(NULL, inode, NULL, ACL_TYPE_ACCESS,
-                                   clone, NULL, NULL);
-       posix_acl_release(clone);
        return ret;
 }
 
@@ -388,8 +382,6 @@ int ocfs2_init_acl(handle_t *handle,
                }
        }
        if ((osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL) && acl) {
-               struct posix_acl *clone;
-
                if (S_ISDIR(inode->i_mode)) {
                        ret = ocfs2_set_acl(handle, inode, di_bh,
                                            ACL_TYPE_DEFAULT, acl,
@@ -397,27 +389,22 @@ int ocfs2_init_acl(handle_t *handle,
                        if (ret)
                                goto cleanup;
                }
-               clone = posix_acl_clone(acl, GFP_NOFS);
-               ret = -ENOMEM;
-               if (!clone)
-                       goto cleanup;
-
                mode = inode->i_mode;
-               ret = posix_acl_create_masq(clone, &mode);
-               if (ret >= 0) {
-                       ret2 = ocfs2_acl_set_mode(inode, di_bh, handle, mode);
-                       if (ret2) {
-                               mlog_errno(ret2);
-                               ret = ret2;
-                               goto cleanup;
-                       }
-                       if (ret > 0) {
-                               ret = ocfs2_set_acl(handle, inode,
-                                                   di_bh, ACL_TYPE_ACCESS,
-                                                   clone, meta_ac, data_ac);
-                       }
+               ret = posix_acl_create(&acl, GFP_NOFS, &mode);
+               if (ret < 0)
+                       return ret;
+
+               ret2 = ocfs2_acl_set_mode(inode, di_bh, handle, mode);
+               if (ret2) {
+                       mlog_errno(ret2);
+                       ret = ret2;
+                       goto cleanup;
+               }
+               if (ret > 0) {
+                       ret = ocfs2_set_acl(handle, inode,
+                                           di_bh, ACL_TYPE_ACCESS,
+                                           acl, meta_ac, data_ac);
                }
-               posix_acl_release(clone);
        }
 cleanup:
        posix_acl_release(acl);