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, 11 deletions

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index c13ea9fbf36b..88bca53b302a 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -272,7 +272,7 @@ failed:
 
 int btrfs_acl_chmod(struct inode *inode)
 {
-        struct posix_acl *acl, *clone;
+        struct posix_acl *acl;
         int ret = 0;
 
         if (S_ISLNK(inode->i_mode))
@@ -285,17 +285,11 @@ int btrfs_acl_chmod(struct inode *inode)
         if (IS_ERR_OR_NULL(acl))
                 return PTR_ERR(acl);
 
-        clone = posix_acl_clone(acl, GFP_KERNEL);
+        ret = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
+        if (ret)
+                return ret;
+        ret = btrfs_set_acl(NULL, inode, acl, ACL_TYPE_ACCESS);
         posix_acl_release(acl);
-        if (!clone)
-                return -ENOMEM;
-
-        ret = posix_acl_chmod_masq(clone, inode->i_mode);
-        if (!ret)
-                ret = btrfs_set_acl(NULL, inode, clone, ACL_TYPE_ACCESS);
-
-        posix_acl_release(clone);
-
         return ret;
 }