From fad52c09422ad1a442b148c6fed86fe77a162c8c Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 23 Jul 2011 02:41:54 -0400
Subject: [PATCH] --- yaml --- r: 258831 b: refs/heads/master c:
 95203befa8887997f14077d8557e67d78457ee02 h: refs/heads/master i:   258829:
 a09a834219c4c1e87444a5c1666f10a1a77b417b   258827:
 9e15eec9f0c9981942af3fe8d73875698a2a3d6c   258823:
 2dd4e475461844c8d659473a906ebda95bb5d2f7   258815:
 588365d2e556bb4d127fcdee0f038abc56e66bce v: v3

---
 [refs]                 |  2 +-
 trunk/fs/generic_acl.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index afc37d477e04..f37e13ce988f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc26ab5f65ae41b71df86ea46df3c3833d1d8d83
+refs/heads/master: 95203befa8887997f14077d8557e67d78457ee02
diff --git a/trunk/fs/generic_acl.c b/trunk/fs/generic_acl.c
index 3a60d9d1653c..134782116a62 100644
--- a/trunk/fs/generic_acl.c
+++ b/trunk/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)