Merge branch 'fix/kconfig' into for-linus

[pandora-kernel.git] / fs / nfs / nfs3acl.c

diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
index 2743427..7ef2397 100644 (file)
--- a/fs/nfs/nfs3acl.c
+++ b/fs/nfs/nfs3acl.c
@@ -415,7 +415,7 @@ fail:
 }
 
 int nfs3_proc_set_default_acl(struct inode *dir, struct inode *inode,
-               mode_t mode)
+               umode_t mode)
 {
        struct posix_acl *dfacl, *acl;
        int error = 0;
@@ -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);