kill boilerplates around posix_acl_create_masq()

new helper: posix_acl_create(&acl, gfp, mode_p).  Replaces acl with
modified clone, on failure releases acl and replaces with NULL.
Returns 0 or -ve on error.  All callers of posix_acl_create_masq()
switched.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 5 insertions, 10 deletions

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 71d022d38508..5783ed81171b 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -277,7 +277,7 @@ int jffs2_check_acl(struct inode *inode, int mask)
 
 int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, mode_t *i_mode)
 {
-        struct posix_acl *acl, *clone;
+        struct posix_acl *acl;
         int rc;
 
         cache_no_acl(inode);
@@ -295,18 +295,13 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, mode_t *i_mode)
                 if (S_ISDIR(*i_mode))
                         set_cached_acl(inode, ACL_TYPE_DEFAULT, acl);
 
-                clone = posix_acl_clone(acl, GFP_KERNEL);
-                if (!clone)
-                        return -ENOMEM;
-                rc = posix_acl_create_masq(clone, i_mode);
-                if (rc < 0) {
-                        posix_acl_release(clone);
+                rc = posix_acl_create(&acl, GFP_KERNEL, i_mode);
+                if (rc < 0)
                         return rc;
-                }
                 if (rc > 0)
-                        set_cached_acl(inode, ACL_TYPE_ACCESS, clone);
+                        set_cached_acl(inode, ACL_TYPE_ACCESS, acl);
 
-                posix_acl_release(clone);
+                posix_acl_release(acl);
         }
         return 0;
 }