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>

2 files changed, 12 insertions, 18 deletions

diff --git a/fs/xfs/linux-2.6/xfs_acl.c b/fs/xfs/linux-2.6/xfs_acl.c
index 4c554122db02..2827bbd8366e 100644
--- a/fs/xfs/linux-2.6/xfs_acl.c
+++ b/fs/xfs/linux-2.6/xfs_acl.c
@@ -282,29 +282,23 @@ posix_acl_default_exists(struct inode *inode)
  * No need for i_mutex because the inode is not yet exposed to the VFS.
  */
 int
-xfs_inherit_acl(struct inode *inode, struct posix_acl *default_acl)
+xfs_inherit_acl(struct inode *inode, struct posix_acl *acl)
 {
-        struct posix_acl *clone;
-        mode_t mode;
+        mode_t mode = inode->i_mode;
         int error = 0, inherit = 0;
 
         if (S_ISDIR(inode->i_mode)) {
-                error = xfs_set_acl(inode, ACL_TYPE_DEFAULT, default_acl);
+                error = xfs_set_acl(inode, ACL_TYPE_DEFAULT, acl);
                 if (error)
-                        return error;
+                        goto out;
         }
 
-        clone = posix_acl_clone(default_acl, GFP_KERNEL);
-        if (!clone)
-                return -ENOMEM;
-
-        mode = inode->i_mode;
-        error = posix_acl_create_masq(clone, &mode);
+        error = posix_acl_create(&acl, GFP_KERNEL, &mode);
         if (error < 0)
-                goto out_release_clone;
+                return error;
 
         /*
-         * If posix_acl_create_masq returns a positive value we need to
+         * If posix_acl_create returns a positive value we need to
          * inherit a permission that can't be represented using the Unix
          * mode bits and we actually need to set an ACL.
          */
@@ -313,13 +307,13 @@ xfs_inherit_acl(struct inode *inode, struct posix_acl *default_acl)
 
         error = xfs_set_mode(inode, mode);
         if (error)
-                goto out_release_clone;
+                goto out;
 
         if (inherit)
-                error = xfs_set_acl(inode, ACL_TYPE_ACCESS, clone);
+                error = xfs_set_acl(inode, ACL_TYPE_ACCESS, acl);
 
- out_release_clone:
-        posix_acl_release(clone);
+out:
+        posix_acl_release(acl);
         return error;
 }
 
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index de666917db06..77463dd55198 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -202,9 +202,9 @@ xfs_vn_mknod(
 
         if (default_acl) {
                 error = -xfs_inherit_acl(inode, default_acl);
+                default_acl = NULL;
                 if (unlikely(error))
                         goto out_cleanup_inode;
-                posix_acl_release(default_acl);
         }