---

yaml --- r: 258831 b: refs/heads/master c: 95203be h: refs/heads/master i: 258829: a09a834 258827: 9e15eec 258823: 2dd4e47 258815: 588365d v: v3
git-mirror · Jul 25, 2011 · fad52c0 · fad52c0
1 parent da6c221
commit fad52c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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)