diff --git a/[refs] b/[refs]
index e7f2d015d77e..7a73ebea69bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f26afba46f0ebf155cf9be746496a0304a5b7cf
+refs/heads/master: 731e3d1b4348a96d53de6c084774424dedc64a3b
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index 6b4d0cca5c7f..a372985b3a9a 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -163,6 +163,9 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
 	if (!is_owner_or_cap(dentry->d_inode))
 		return -EPERM;
 
+	if (!IS_POSIXACL(dentry->d_inode))
+		return -EOPNOTSUPP;
+
 	if (value) {
 		acl = posix_acl_from_xattr(value, size);
 		if (acl == NULL) {