Merge tag 'pm+acpi-3.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[karo-tx-linux.git] / fs / ceph / acl.c

diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index f6911284c9bd63e45bf174b290f272656f9f29e1..4c2d452c4bfc0abad11cf3e3b0577d62ed3ef240 100644 (file)
--- a/fs/ceph/acl.c
+++ b/fs/ceph/acl.c
@@ -66,13 +66,6 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type)
        char *value = NULL;
        struct posix_acl *acl;
 
-       if (!IS_POSIXACL(inode))
-               return NULL;
-
-       acl = ceph_get_cached_acl(inode, type);
-       if (acl != ACL_NOT_CACHED)
-               return acl;
-
        switch (type) {
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;
@@ -107,14 +100,14 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type)
        return acl;
 }
 
-static int ceph_set_acl(struct dentry *dentry, struct inode *inode,
-                               struct posix_acl *acl, int type)
+int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 {
        int ret = 0, size = 0;
        const char *name = NULL;
        char *value = NULL;
        struct iattr newattrs;
        umode_t new_mode = inode->i_mode, old_mode = inode->i_mode;
+       struct dentry *dentry;
 
        if (acl) {
                ret = posix_acl_valid(acl);
@@ -158,12 +151,13 @@ static int ceph_set_acl(struct dentry *dentry, struct inode *inode,
                        goto out_free;
        }
 
+       dentry = d_find_alias(inode);
        if (new_mode != old_mode) {
                newattrs.ia_mode = new_mode;
                newattrs.ia_valid = ATTR_MODE;
                ret = ceph_setattr(dentry, &newattrs);
                if (ret)
-                       goto out_free;
+                       goto out_dput;
        }
 
        if (value)
@@ -177,11 +171,13 @@ static int ceph_set_acl(struct dentry *dentry, struct inode *inode,
                        newattrs.ia_valid = ATTR_MODE;
                        ceph_setattr(dentry, &newattrs);
                }
-               goto out_free;
+               goto out_dput;
        }
 
        ceph_set_cached_acl(inode, type, acl);
 
+out_dput:
+       dput(dentry);
 out_free:
        kfree(value);
 out:
@@ -190,42 +186,24 @@ out:
 
 int ceph_init_acl(struct dentry *dentry, struct inode *inode, struct inode *dir)
 {
-       struct posix_acl *acl = NULL;
-       int ret = 0;
-
-       if (!S_ISLNK(inode->i_mode)) {
-               if (IS_POSIXACL(dir)) {
-                       acl = ceph_get_acl(dir, ACL_TYPE_DEFAULT);
-                       if (IS_ERR(acl)) {
-                               ret = PTR_ERR(acl);
-                               goto out;
-                       }
-               }
+       struct posix_acl *default_acl, *acl;
+       int error;
 
-               if (!acl)
-                       inode->i_mode &= ~current_umask();
-       }
+       error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
+       if (error)
+               return error;
 
-       if (IS_POSIXACL(dir) && acl) {
-               if (S_ISDIR(inode->i_mode)) {
-                       ret = ceph_set_acl(dentry, inode, acl,
-                                               ACL_TYPE_DEFAULT);
-                       if (ret)
-                               goto out_release;
-               }
-               ret = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
-               if (ret < 0)
-                       goto out;
-               else if (ret > 0)
-                       ret = ceph_set_acl(dentry, inode, acl, ACL_TYPE_ACCESS);
-               else
-                       cache_no_acl(inode);
-       } else {
+       if (!default_acl && !acl)
                cache_no_acl(inode);
-       }
 
-out_release:
-       posix_acl_release(acl);
-out:
-       return ret;
+       if (default_acl) {
+               error = ceph_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
+               posix_acl_release(default_acl);
+       }
+       if (acl) {
+               if (!error)
+                       error = ceph_set_acl(inode, acl, ACL_TYPE_ACCESS);
+               posix_acl_release(acl);
+       }
+       return error;
 }