From aa6061b3c5857bd699525e969ec573d3a6d3bb32 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 29 May 2010 09:48:35 +0000
Subject: [PATCH] --- yaml --- r: 200365 b: refs/heads/master c:
 834e74759a473f8101a273e843d1edec2778801d h: refs/heads/master i:   200363:
 1ecc5fa2df0131fccce20f2cb045aec9a9d77614 v: v3

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

diff --git a/[refs] b/[refs]
index 13850862fdd2..026f745f7e4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15e7000095e6fc9ad07e476a100c900c72c14225
+refs/heads/master: 834e74759a473f8101a273e843d1edec2778801d
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index a372985b3a9a..1606dc1e8d4a 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -60,6 +60,8 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 		size = __btrfs_getxattr(inode, name, value, size);
 		if (size > 0) {
 			acl = posix_acl_from_xattr(value, size);
+			if (IS_ERR(acl))
+				return acl;
 			set_cached_acl(inode, type, acl);
 		}
 		kfree(value);