Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

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

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index b206d4c..eb159aa 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -28,7 +28,7 @@
 #include "btrfs_inode.h"
 #include "xattr.h"
 
-static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
+struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 {
        int size;
        const char *name;
@@ -109,7 +109,6 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,
        int ret, size = 0;
        const char *name;
        char *value = NULL;
-       mode_t mode;
 
        if (acl) {
                ret = posix_acl_valid(acl);
@@ -120,13 +119,11 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,
 
        switch (type) {
        case ACL_TYPE_ACCESS:
-               mode = inode->i_mode;
                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;
-                       inode->i_mode = mode;
                }
                ret = 0;
                break;
@@ -193,28 +190,6 @@ out:
        return ret;
 }
 
-int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags)
-{
-       int error = -EAGAIN;
-
-       if (flags & IPERM_FLAG_RCU) {
-               if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))
-                       error = -ECHILD;
-
-       } else {
-               struct posix_acl *acl;
-               acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);
-               if (IS_ERR(acl))
-                       return PTR_ERR(acl);
-               if (acl) {
-                       error = posix_acl_permission(inode, acl, mask);
-                       posix_acl_release(acl);
-               }
-       }
-
-       return error;
-}
-
 /*
  * btrfs_init_acl is already generally called under fs_mutex, so the locking
  * stuff has been fixed to work with that.  If the locking stuff changes, we
@@ -242,31 +217,20 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,
        }
 
        if (IS_POSIXACL(dir) && acl) {
-               struct posix_acl *clone;
-               mode_t mode;
-
                if (S_ISDIR(inode->i_mode)) {
                        ret = btrfs_set_acl(trans, inode, acl,
                                            ACL_TYPE_DEFAULT);
                        if (ret)
                                goto failed;
                }
-               clone = posix_acl_clone(acl, GFP_NOFS);
-               ret = -ENOMEM;
-               if (!clone)
-                       goto failed;
-
-               mode = inode->i_mode;
-               ret = posix_acl_create_masq(clone, &mode);
-               if (ret >= 0) {
-                       inode->i_mode = mode;
-                       if (ret > 0) {
-                               /* we need an acl */
-                               ret = btrfs_set_acl(trans, inode, clone,
-                                                   ACL_TYPE_ACCESS);
-                       }
+               ret = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
+               if (ret < 0)
+                       return ret;
+
+               if (ret > 0) {
+                       /* we need an acl */
+                       ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
                }
-               posix_acl_release(clone);
        }
 failed:
        posix_acl_release(acl);
@@ -276,7 +240,7 @@ failed:
 
 int btrfs_acl_chmod(struct inode *inode)
 {
-       struct posix_acl *acl, *clone;
+       struct posix_acl *acl;
        int ret = 0;
 
        if (S_ISLNK(inode->i_mode))
@@ -289,17 +253,11 @@ int btrfs_acl_chmod(struct inode *inode)
        if (IS_ERR_OR_NULL(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 = btrfs_set_acl(NULL, inode, acl, ACL_TYPE_ACCESS);
        posix_acl_release(acl);
-       if (!clone)
-               return -ENOMEM;
-
-       ret = posix_acl_chmod_masq(clone, inode->i_mode);
-       if (!ret)
-               ret = btrfs_set_acl(NULL, inode, clone, ACL_TYPE_ACCESS);
-
-       posix_acl_release(clone);
-
        return ret;
 }