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, 4 insertions, 10 deletions

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 160d4e1575ce..a2dd63c0c11a 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -137,7 +137,7 @@ out:
 int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);
-        struct posix_acl *acl, *clone;
+        struct posix_acl *acl;
         mode_t mode = inode->i_mode;
         int error = 0;
 
@@ -162,16 +162,10 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode)
                         goto out;
         }
 
-        clone = posix_acl_clone(acl, GFP_NOFS);
-        error = -ENOMEM;
-        if (!clone)
-                goto out;
-        posix_acl_release(acl);
-        acl = clone;
-
-        error = posix_acl_create_masq(acl, &mode);
+        error = posix_acl_create(&acl, GFP_NOFS, &mode);
         if (error < 0)
-                goto out;
+                return error;
+
         if (error == 0)
                 goto munge;