kill boilerplates around posix_acl_create_masq()

[pandora-kernel.git] / fs / generic_acl.c

diff --git a/fs/generic_acl.c b/fs/generic_acl.c
index 1347821..ea19ca4 100644 (file)
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
@@ -132,25 +132,17 @@ generic_acl_init(struct inode *inode, struct inode *dir)
        if (!S_ISLNK(inode->i_mode))
                acl = get_cached_acl(dir, ACL_TYPE_DEFAULT);
        if (acl) {
-               struct posix_acl *clone;
-
                if (S_ISDIR(inode->i_mode))
                        set_cached_acl(inode, ACL_TYPE_DEFAULT, acl);
-               clone = posix_acl_clone(acl, GFP_KERNEL);
-               error = -ENOMEM;
-               if (!clone)
-                       goto cleanup;
-               error = posix_acl_create_masq(clone, &mode);
-               if (error >= 0) {
-                       inode->i_mode = mode;
-                       if (error > 0)
-                               set_cached_acl(inode, ACL_TYPE_ACCESS, clone);
-               }
-               posix_acl_release(clone);
+               error = posix_acl_create(&acl, GFP_KERNEL, &mode);
+               if (error < 0)
+                       return error;
+               inode->i_mode = mode;
+               if (error > 0)
+                       set_cached_acl(inode, ACL_TYPE_ACCESS, acl);
        }
        error = 0;
 
-cleanup:
        posix_acl_release(acl);
        return error;
 }