kill boilerplate around posix_acl_chmod_masq()

new helper: posix_acl_chmod(&acl, gfp, mode).  Replaces acl with modified
clone or with NULL if that has failed; returns 0 or -ve on error.  All
callers of posix_acl_chmod_masq() switched to that - they'd been doing
exactly the same thing.

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

1 files changed, 12 insertions, 18 deletions

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 48171f4c943d..160d4e1575ce 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -187,7 +187,7 @@ out:
 
 int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr)
 {
-        struct posix_acl *acl, *clone;
+        struct posix_acl *acl;
         char *data;
         unsigned int len;
         int error;
@@ -198,25 +198,19 @@ int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr)
         if (!acl)
                 return gfs2_setattr_simple(ip, attr);
 
-        clone = posix_acl_clone(acl, GFP_NOFS);
+        error = posix_acl_chmod(&acl, GFP_NOFS, attr->ia_mode);
+        if (error)
+                return error;
+
+        len = posix_acl_to_xattr(acl, NULL, 0);
+        data = kmalloc(len, GFP_NOFS);
         error = -ENOMEM;
-        if (!clone)
+        if (data == NULL)
                 goto out;
-        posix_acl_release(acl);
-        acl = clone;
-
-        error = posix_acl_chmod_masq(acl, attr->ia_mode);
-        if (!error) {
-                len = posix_acl_to_xattr(acl, NULL, 0);
-                data = kmalloc(len, GFP_NOFS);
-                error = -ENOMEM;
-                if (data == NULL)
-                        goto out;
-                posix_acl_to_xattr(acl, data, len);
-                error = gfs2_xattr_acl_chmod(ip, attr, data);
-                kfree(data);
-                set_cached_acl(&ip->i_inode, ACL_TYPE_ACCESS, acl);
-        }
+        posix_acl_to_xattr(acl, data, len);
+        error = gfs2_xattr_acl_chmod(ip, attr, data);
+        kfree(data);
+        set_cached_acl(&ip->i_inode, ACL_TYPE_ACCESS, acl);
 
 out:
         posix_acl_release(acl);