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

[~andy/linux] / fs / jfs / acl.c

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index d254d6d3599565fbca59621cf840d105d9cd4971..e973b85d6afd9f136bcae002cbe70432000e5a15 100644 (file)
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -72,7 +72,7 @@ struct posix_acl *jfs_get_acl(struct inode *inode, int type)
        return acl;
 }
 
-static int jfs_set_acl(tid_t tid, struct inode *inode, int type,
+static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
                       struct posix_acl *acl)
 {
        char *ea_name;
@@ -80,21 +80,22 @@ static int jfs_set_acl(tid_t tid, struct inode *inode, int type,
        int size = 0;
        char *value = NULL;
 
-       if (S_ISLNK(inode->i_mode))
-               return -EOPNOTSUPP;
-
-       switch(type) {
-               case ACL_TYPE_ACCESS:
-                       ea_name = POSIX_ACL_XATTR_ACCESS;
-                       break;
-               case ACL_TYPE_DEFAULT:
-                       ea_name = POSIX_ACL_XATTR_DEFAULT;
-                       if (!S_ISDIR(inode->i_mode))
-                               return acl ? -EACCES : 0;
-                       break;
-               default:
-                       return -EINVAL;
+       switch (type) {
+       case ACL_TYPE_ACCESS:
+               ea_name = POSIX_ACL_XATTR_ACCESS;
+               rc = posix_acl_equiv_mode(acl, &inode->i_mode);
+               if (rc < 0)
+                       return rc;
+               if (rc == 0)
+                       acl = NULL;
+               break;
+       case ACL_TYPE_DEFAULT:
+               ea_name = POSIX_ACL_XATTR_DEFAULT;
+               break;
+       default:
+               return -EINVAL;
        }
+
        if (acl) {
                size = posix_acl_xattr_size(acl->a_count);
                value = kmalloc(size, GFP_KERNEL);
@@ -114,65 +115,43 @@ out:
        return rc;
 }
 
+int jfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
+{
+       int rc;
+       tid_t tid;
+
+       tid = txBegin(inode->i_sb, 0);
+       mutex_lock(&JFS_IP(inode)->commit_mutex);
+       rc = __jfs_set_acl(tid, inode, type, acl);
+       if (!rc)
+               rc = txCommit(tid, 1, &inode, 0);
+       txEnd(tid);
+       mutex_unlock(&JFS_IP(inode)->commit_mutex);
+       return rc;
+}
+
 int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
 {
-       struct posix_acl *acl = NULL;
+       struct posix_acl *default_acl, *acl;
        int rc = 0;
 
-       if (S_ISLNK(inode->i_mode))
-               return 0;
+       rc = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
+       if (rc)
+               return rc;
 
-       acl = jfs_get_acl(dir, ACL_TYPE_DEFAULT);
-       if (IS_ERR(acl))
-               return PTR_ERR(acl);
+       if (default_acl) {
+               rc = __jfs_set_acl(tid, inode, ACL_TYPE_DEFAULT, default_acl);
+               posix_acl_release(default_acl);
+       }
 
        if (acl) {
-               if (S_ISDIR(inode->i_mode)) {
-                       rc = jfs_set_acl(tid, inode, ACL_TYPE_DEFAULT, acl);
-                       if (rc)
-                               goto cleanup;
-               }
-               rc = posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);
-               if (rc < 0)
-                       goto cleanup; /* posix_acl_release(NULL) is no-op */
-               if (rc > 0)
-                       rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);
-cleanup:
+               if (!rc)
+                       rc = __jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);
                posix_acl_release(acl);
-       } else
-               inode->i_mode &= ~current_umask();
+       }
 
        JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) |
                               inode->i_mode;
 
        return rc;
 }
-
-int jfs_acl_chmod(struct inode *inode)
-{
-       struct posix_acl *acl;
-       int rc;
-       tid_t tid;
-
-       if (S_ISLNK(inode->i_mode))
-               return -EOPNOTSUPP;
-
-       acl = jfs_get_acl(inode, ACL_TYPE_ACCESS);
-       if (IS_ERR(acl) || !acl)
-               return PTR_ERR(acl);
-
-       rc = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
-       if (rc)
-               return rc;
-
-       tid = txBegin(inode->i_sb, 0);
-       mutex_lock(&JFS_IP(inode)->commit_mutex);
-       rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);
-       if (!rc)
-               rc = txCommit(tid, 1, &inode, 0);
-       txEnd(tid);
-       mutex_unlock(&JFS_IP(inode)->commit_mutex);
-
-       posix_acl_release(acl);
-       return rc;
-}