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, 7 insertions, 16 deletions

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 89ced71e225a..687a1ae42e3f 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -133,8 +133,6 @@ int jfs_check_acl(struct inode *inode, int mask)
 int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
 {
         struct posix_acl *acl = NULL;
-        struct posix_acl *clone;
-        mode_t mode;
         int rc = 0;
 
         if (S_ISLNK(inode->i_mode))
@@ -145,25 +143,18 @@ int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
                 return PTR_ERR(acl);
 
         if (acl) {
+                mode_t mode = inode->i_mode;
                 if (S_ISDIR(inode->i_mode)) {
                         rc = jfs_set_acl(tid, inode, ACL_TYPE_DEFAULT, acl);
                         if (rc)
                                 goto cleanup;
                 }
-                clone = posix_acl_clone(acl, GFP_KERNEL);
-                if (!clone) {
-                        rc = -ENOMEM;
-                        goto cleanup;
-                }
-                mode = inode->i_mode;
-                rc = posix_acl_create_masq(clone, &mode);
-                if (rc >= 0) {
-                        inode->i_mode = mode;
-                        if (rc > 0)
-                                rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS,
-                                                 clone);
-                }
-                posix_acl_release(clone);
+                rc = posix_acl_create(&acl, GFP_KERNEL, &mode);
+                if (rc < 0)
+                        goto cleanup; /* posix_acl_release(NULL) is no-op */
+                inode->i_mode = mode;
+                if (rc > 0)
+                        rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);
 cleanup:
                 posix_acl_release(acl);
         } else