From 95203befa8887997f14077d8557e67d78457ee02 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 23 Jul 2011 02:41:54 -0400 Subject: [PATCH] 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 --- fs/generic_acl.c | 10 ++-------- 1 file 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) -- 2.7.4