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, 3 insertions, 7 deletions

diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
index 274342771655..e49e73107e62 100644
--- a/fs/nfs/nfs3acl.c
+++ b/fs/nfs/nfs3acl.c
@@ -427,16 +427,12 @@ int nfs3_proc_set_default_acl(struct inode *dir, struct inode *inode,
         }
         if (!dfacl)
                 return 0;
-        acl = posix_acl_clone(dfacl, GFP_KERNEL);
-        error = -ENOMEM;
-        if (!acl)
-                goto out_release_dfacl;
-        error = posix_acl_create_masq(acl, &mode);
+        acl = posix_acl_dup(dfacl);
+        error = posix_acl_create(&acl, GFP_KERNEL, &mode);
         if (error < 0)
-                goto out_release_acl;
+                goto out_release_dfacl;
         error = nfs3_proc_setacls(inode, acl, S_ISDIR(inode->i_mode) ?
                                                       dfacl : NULL);
-out_release_acl:
         posix_acl_release(acl);
 out_release_dfacl:
         posix_acl_release(dfacl);