git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill boilerplates around posix_acl_create_masq()
[pandora-kernel.git]
/
fs
/
nfs
/
nfs3acl.c
diff --git
a/fs/nfs/nfs3acl.c
b/fs/nfs/nfs3acl.c
index
2743427
..
e49e731
100644
(file)
--- 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;
}
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)
if (error < 0)
- goto out_release_acl;
+ goto out_release_
df
acl;
error = nfs3_proc_setacls(inode, acl, S_ISDIR(inode->i_mode) ?
dfacl : NULL);
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);
posix_acl_release(acl);
out_release_dfacl:
posix_acl_release(dfacl);