From 560cad40090285bac681ae3ac2ba0806b20566f0 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Sun, 17 Jan 2010 20:36:18 -0500
Subject: [PATCH] --- yaml --- r: 179626 b: refs/heads/master c:
 a9cc71a60c29a09174bee2fcef8f924c529fd4b7 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/btrfs/acl.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a43cb4ffaa5b..453b2f1eaf18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c090a11e1c403b727a6a8eff0b97d5fb9e95cb5
+refs/heads/master: a9cc71a60c29a09174bee2fcef8f924c529fd4b7
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index 1898f8555f06..fa44e92e9b8f 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -112,12 +112,14 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,
 	switch (type) {
 	case ACL_TYPE_ACCESS:
 		mode = inode->i_mode;
-		ret = posix_acl_equiv_mode(acl, &mode);
-		if (ret < 0)
-			return ret;
-		ret = 0;
-		inode->i_mode = mode;
 		name = POSIX_ACL_XATTR_ACCESS;
+		if (acl) {
+			ret = posix_acl_equiv_mode(acl, &mode);
+			if (ret < 0)
+				return ret;
+			inode->i_mode = mode;
+		}
+		ret = 0;
 		break;
 	case ACL_TYPE_DEFAULT:
 		if (!S_ISDIR(inode->i_mode))