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, 5 insertions, 8 deletions

diff --git a/fs/generic_acl.c b/fs/generic_acl.c
index 4949473d3542..3a60d9d1653c 100644
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
@@ -170,21 +170,18 @@ cleanup:
 int
 generic_acl_chmod(struct inode *inode)
 {
-        struct posix_acl *acl, *clone;
+        struct posix_acl *acl;
         int error = 0;
 
         if (S_ISLNK(inode->i_mode))
                 return -EOPNOTSUPP;
         acl = get_cached_acl(inode, ACL_TYPE_ACCESS);
         if (acl) {
-                clone = posix_acl_clone(acl, GFP_KERNEL);
+                error = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
+                if (error)
+                        return error;
+                set_cached_acl(inode, ACL_TYPE_ACCESS, acl);
                 posix_acl_release(acl);
-                if (!clone)
-                        return -ENOMEM;
-                error = posix_acl_chmod_masq(clone, inode->i_mode);
-                if (!error)
-                        set_cached_acl(inode, ACL_TYPE_ACCESS, clone);
-                posix_acl_release(clone);
         }
         return error;
 }