1 files changed, 140 insertions, 8 deletions

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index 83b9b5a8d112..1ccb26bc2a0b 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -162,7 +162,8 @@ fail:
         return ERR_PTR(-EINVAL);
 }
 
-struct posix_acl *f2fs_get_acl(struct inode *inode, int type)
+static struct posix_acl *__f2fs_get_acl(struct inode *inode, int type,
+                                                struct page *dpage)
 {
         int name_index = F2FS_XATTR_INDEX_POSIX_ACL_DEFAULT;
         void *value = NULL;
@@ -172,12 +173,13 @@ struct posix_acl *f2fs_get_acl(struct inode *inode, int type)
         if (type == ACL_TYPE_ACCESS)
                 name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS;
 
-        retval = f2fs_getxattr(inode, name_index, "", NULL, 0);
+        retval = f2fs_getxattr(inode, name_index, "", NULL, 0, dpage);
         if (retval > 0) {
                 value = kmalloc(retval, GFP_F2FS_ZERO);
                 if (!value)
                         return ERR_PTR(-ENOMEM);
-                retval = f2fs_getxattr(inode, name_index, "", value, retval);
+                retval = f2fs_getxattr(inode, name_index, "", value,
+                                                        retval, dpage);
         }
 
         if (retval > 0)
@@ -194,6 +196,11 @@ struct posix_acl *f2fs_get_acl(struct inode *inode, int type)
         return acl;
 }
 
+struct posix_acl *f2fs_get_acl(struct inode *inode, int type)
+{
+        return __f2fs_get_acl(inode, type, NULL);
+}
+
 static int __f2fs_set_acl(struct inode *inode, int type,
                         struct posix_acl *acl, struct page *ipage)
 {
@@ -229,7 +236,7 @@ static int __f2fs_set_acl(struct inode *inode, int type,
         if (acl) {
                 value = f2fs_acl_to_disk(acl, &size);
                 if (IS_ERR(value)) {
-                        cond_clear_inode_flag(fi, FI_ACL_MODE);
+                        clear_inode_flag(fi, FI_ACL_MODE);
                         return (int)PTR_ERR(value);
                 }
         }
@@ -240,7 +247,7 @@ static int __f2fs_set_acl(struct inode *inode, int type,
         if (!error)
                 set_cached_acl(inode, type, acl);
 
-        cond_clear_inode_flag(fi, FI_ACL_MODE);
+        clear_inode_flag(fi, FI_ACL_MODE);
         return error;
 }
 
@@ -249,12 +256,137 @@ int f2fs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
         return __f2fs_set_acl(inode, type, acl, NULL);
 }
 
-int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage)
+/*
+ * Most part of f2fs_acl_clone, f2fs_acl_create_masq, f2fs_acl_create
+ * are copied from posix_acl.c
+ */
+static struct posix_acl *f2fs_acl_clone(const struct posix_acl *acl,
+                                                        gfp_t flags)
+{
+        struct posix_acl *clone = NULL;
+
+        if (acl) {
+                int size = sizeof(struct posix_acl) + acl->a_count *
+                                sizeof(struct posix_acl_entry);
+                clone = kmemdup(acl, size, flags);
+                if (clone)
+                        atomic_set(&clone->a_refcount, 1);
+        }
+        return clone;
+}
+
+static int f2fs_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
+{
+        struct posix_acl_entry *pa, *pe;
+        struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL;
+        umode_t mode = *mode_p;
+        int not_equiv = 0;
+
+        /* assert(atomic_read(acl->a_refcount) == 1); */
+
+        FOREACH_ACL_ENTRY(pa, acl, pe) {
+                switch(pa->e_tag) {
+                case ACL_USER_OBJ:
+                        pa->e_perm &= (mode >> 6) | ~S_IRWXO;
+                        mode &= (pa->e_perm << 6) | ~S_IRWXU;
+                        break;
+
+                case ACL_USER:
+                case ACL_GROUP:
+                        not_equiv = 1;
+                        break;
+
+                case ACL_GROUP_OBJ:
+                        group_obj = pa;
+                        break;
+
+                case ACL_OTHER:
+                        pa->e_perm &= mode | ~S_IRWXO;
+                        mode &= pa->e_perm | ~S_IRWXO;
+                        break;
+
+                case ACL_MASK:
+                        mask_obj = pa;
+                        not_equiv = 1;
+                        break;
+
+                default:
+                        return -EIO;
+                }
+        }
+
+        if (mask_obj) {
+                mask_obj->e_perm &= (mode >> 3) | ~S_IRWXO;
+                mode &= (mask_obj->e_perm << 3) | ~S_IRWXG;
+        } else {
+                if (!group_obj)
+                        return -EIO;
+                group_obj->e_perm &= (mode >> 3) | ~S_IRWXO;
+                mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
+        }
+
+        *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
+        return not_equiv;
+}
+
+static int f2fs_acl_create(struct inode *dir, umode_t *mode,
+                struct posix_acl **default_acl, struct posix_acl **acl,
+                struct page *dpage)
+{
+        struct posix_acl *p;
+        int ret;
+
+        if (S_ISLNK(*mode) || !IS_POSIXACL(dir))
+                goto no_acl;
+
+        p = __f2fs_get_acl(dir, ACL_TYPE_DEFAULT, dpage);
+        if (IS_ERR(p)) {
+                if (p == ERR_PTR(-EOPNOTSUPP))
+                        goto apply_umask;
+                return PTR_ERR(p);
+        }
+
+        if (!p)
+                goto apply_umask;
+
+        *acl = f2fs_acl_clone(p, GFP_NOFS);
+        if (!*acl)
+                return -ENOMEM;
+
+        ret = f2fs_acl_create_masq(*acl, mode);
+        if (ret < 0) {
+                posix_acl_release(*acl);
+                return -ENOMEM;
+        }
+
+        if (ret == 0) {
+                posix_acl_release(*acl);
+                *acl = NULL;
+        }
+
+        if (!S_ISDIR(*mode)) {
+                posix_acl_release(p);
+                *default_acl = NULL;
+        } else {
+                *default_acl = p;
+        }
+        return 0;
+
+apply_umask:
+        *mode &= ~current_umask();
+no_acl:
+        *default_acl = NULL;
+        *acl = NULL;
+        return 0;
+}
+
+int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
+                                                        struct page *dpage)
 {
-        struct posix_acl *default_acl, *acl;
+        struct posix_acl *default_acl = NULL, *acl = NULL;
         int error = 0;
 
-        error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
+        error = f2fs_acl_create(dir, &inode->i_mode, &default_acl, &acl, dpage);
         if (error)
                 return error;