diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-23 02:41:54 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:27:31 -0400 |
| commit | 95203befa8887997f14077d8557e67d78457ee02 (patch) | |
| tree | 6c00a95e1f5cf6c61d2b74f3f6865a4e90bbc6f6 /fs | |
| parent | bc26ab5f65ae41b71df86ea46df3c3833d1d8d83 (diff) | |
| download | op-kernel-dev-95203befa8887997f14077d8557e67d78457ee02.zip op-kernel-dev-95203befa8887997f14077d8557e67d78457ee02.tar.gz | |
generic_acl: no need to clone acl just to push it to set_cached_acl()
In-core acls are copy-on-write, so the reference taken by set_cached_acl() will
do just fine.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/generic_acl.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/generic_acl.c b/fs/generic_acl.c index 3a60d9d..1347821 100644 --- a/fs/generic_acl.c +++ b/fs/generic_acl.c @@ -134,14 +134,8 @@ generic_acl_init(struct inode *inode, struct inode *dir) if (acl) { struct posix_acl *clone; - if (S_ISDIR(inode->i_mode)) { - clone = posix_acl_clone(acl, GFP_KERNEL); - error = -ENOMEM; - if (!clone) - goto cleanup; - set_cached_acl(inode, ACL_TYPE_DEFAULT, clone); - posix_acl_release(clone); - } + if (S_ISDIR(inode->i_mode)) + set_cached_acl(inode, ACL_TYPE_DEFAULT, acl); clone = posix_acl_clone(acl, GFP_KERNEL); error = -ENOMEM; if (!clone) |
