UPSTREAM: clk: rockchip: remove redundant checking of device_node

[firefly-linux-kernel-4.4.55.git] / fs / btrfs / acl.c

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 0890c83643e944f69e43a22f4151e381e7503f04..9a0124a95851014c9000ed7822dc5fad0a2f6995 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -35,13 +35,6 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
        char *value = NULL;
        struct posix_acl *acl;
 
-       if (!IS_POSIXACL(inode))
-               return NULL;
-
-       acl = get_cached_acl(inode, type);
-       if (acl != ACL_NOT_CACHED)
-               return acl;
-
        switch (type) {
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;
@@ -76,44 +69,16 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
        return acl;
 }
 
-static int btrfs_xattr_acl_get(struct dentry *dentry, const char *name,
-               void *value, size_t size, int type)
-{
-       struct posix_acl *acl;
-       int ret = 0;
-
-       if (!IS_POSIXACL(dentry->d_inode))
-               return -EOPNOTSUPP;
-
-       acl = btrfs_get_acl(dentry->d_inode, type);
-
-       if (IS_ERR(acl))
-               return PTR_ERR(acl);
-       if (acl == NULL)
-               return -ENODATA;
-       ret = posix_acl_to_xattr(&init_user_ns, acl, value, size);
-       posix_acl_release(acl);
-
-       return ret;
-}
-
 /*
  * Needs to be called with fs_mutex held
  */
-static int btrfs_set_acl(struct btrfs_trans_handle *trans,
+static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
                         struct inode *inode, struct posix_acl *acl, int type)
 {
        int ret, size = 0;
        const char *name;
        char *value = NULL;
 
-       if (acl) {
-               ret = posix_acl_valid(acl);
-               if (ret < 0)
-                       return ret;
-               ret = 0;
-       }
-
        switch (type) {
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;
@@ -158,35 +123,9 @@ out:
        return ret;
 }
 
-static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
-               const void *value, size_t size, int flags, int type)
+int btrfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 {
-       int ret;
-       struct posix_acl *acl = NULL;
-
-       if (!inode_owner_or_capable(dentry->d_inode))
-               return -EPERM;
-
-       if (!IS_POSIXACL(dentry->d_inode))
-               return -EOPNOTSUPP;
-
-       if (value) {
-               acl = posix_acl_from_xattr(&init_user_ns, value, size);
-               if (IS_ERR(acl))
-                       return PTR_ERR(acl);
-
-               if (acl) {
-                       ret = posix_acl_valid(acl);
-                       if (ret)
-                               goto out;
-               }
-       }
-
-       ret = btrfs_set_acl(NULL, dentry->d_inode, acl, type);
-out:
-       posix_acl_release(acl);
-
-       return ret;
+       return __btrfs_set_acl(NULL, inode, acl, type);
 }
 
 /*
@@ -197,83 +136,31 @@ out:
 int btrfs_init_acl(struct btrfs_trans_handle *trans,
                   struct inode *inode, struct inode *dir)
 {
-       struct posix_acl *acl = NULL;
+       struct posix_acl *default_acl, *acl;
        int ret = 0;
 
        /* this happens with subvols */
        if (!dir)
                return 0;
 
-       if (!S_ISLNK(inode->i_mode)) {
-               if (IS_POSIXACL(dir)) {
-                       acl = btrfs_get_acl(dir, ACL_TYPE_DEFAULT);
-                       if (IS_ERR(acl))
-                               return PTR_ERR(acl);
-               }
+       ret = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
+       if (ret)
+               return ret;
 
-               if (!acl)
-                       inode->i_mode &= ~current_umask();
+       if (default_acl) {
+               ret = __btrfs_set_acl(trans, inode, default_acl,
+                                     ACL_TYPE_DEFAULT);
+               posix_acl_release(default_acl);
        }
 
-       if (IS_POSIXACL(dir) && acl) {
-               if (S_ISDIR(inode->i_mode)) {
-                       ret = btrfs_set_acl(trans, inode, acl,
-                                           ACL_TYPE_DEFAULT);
-                       if (ret)
-                               goto failed;
-               }
-               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);
-               } else if (ret < 0) {
-                       cache_no_acl(inode);
-               }
-       } else {
-               cache_no_acl(inode);
+       if (acl) {
+               if (!ret)
+                       ret = __btrfs_set_acl(trans, inode, acl,
+                                             ACL_TYPE_ACCESS);
+               posix_acl_release(acl);
        }
-failed:
-       posix_acl_release(acl);
-
-       return ret;
-}
 
-int btrfs_acl_chmod(struct inode *inode)
-{
-       struct posix_acl *acl;
-       int ret = 0;
-
-       if (S_ISLNK(inode->i_mode))
-               return -EOPNOTSUPP;
-
-       if (!IS_POSIXACL(inode))
-               return 0;
-
-       acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);
-       if (IS_ERR_OR_NULL(acl))
-               return PTR_ERR(acl);
-
-       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 (!default_acl && !acl)
+               cache_no_acl(inode);
        return ret;
 }
-
-const struct xattr_handler btrfs_xattr_acl_default_handler = {
-       .prefix = POSIX_ACL_XATTR_DEFAULT,
-       .flags  = ACL_TYPE_DEFAULT,
-       .get    = btrfs_xattr_acl_get,
-       .set    = btrfs_xattr_acl_set,
-};
-
-const struct xattr_handler btrfs_xattr_acl_access_handler = {
-       .prefix = POSIX_ACL_XATTR_ACCESS,
-       .flags  = ACL_TYPE_ACCESS,
-       .get    = btrfs_xattr_acl_get,
-       .set    = btrfs_xattr_acl_set,
-};