---

yaml --- r: 232988 b: refs/heads/master c: d0f6968 h: refs/heads/master v: v3
git-mirror · Jan 26, 2011 · db84d1d · db84d1d
1 parent 56903f2
commit db84d1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f3d0bc0df041236fad4ffa82188a6e4ef9af75e
+refs/heads/master: d0f69686c2ae775529aadc7a8acc6f13ad41de66
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
@@ -37,6 +37,9 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 	char *value = NULL;
 	struct posix_acl *acl;
 
+	if (!IS_POSIXACL(inode))
+		return NULL;
+
 	acl = get_cached_acl(inode, type);
 	if (acl != ACL_NOT_CACHED)
 		return acl;
@@ -82,6 +85,9 @@ static int btrfs_xattr_acl_get(struct dentry *dentry, const char *name,
 	struct posix_acl *acl;
 	int ret = 0;
 
+	if (!IS_POSIXACL(dentry->d_inode))
+		return -EOPNOTSUPP;
+
 	acl = btrfs_get_acl(dentry->d_inode, type);
 
 	if (IS_ERR(acl))