From 38b7419f3ced164ca37cb4370b04fe1eefd49bf0 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Mon, 23 Apr 2012 13:55:30 -0400
Subject: [PATCH] --- yaml --- r: 309877 b: refs/heads/master c:
 30f8fe3e47c5bb5715aa80b2a2fa0cab8b218fae h: refs/heads/master i:   309875:
 f44f177b67afb0448efe025c666bbd2b64cb1181 v: v3

---
 [refs]               | 2 +-
 trunk/fs/btrfs/acl.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 620e71a9d65c..5a1a359a40a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c4d2d95d06e920e0c61707e62c7fffc9c57f63a
+refs/heads/master: 30f8fe3e47c5bb5715aa80b2a2fa0cab8b218fae
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index 89b156d85d63..761e2cd8fed1 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -227,7 +227,11 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,
 		if (ret > 0) {
 			/* we need an acl */
 			ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
+		} else {
+			cache_no_acl(inode);
 		}
+	} else {
+		cache_no_acl(inode);
 	}
 failed:
 	posix_acl_release(acl);