From db84d1df94b3aeb852506b7514572f8273aa21da Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Tue, 25 Jan 2011 15:46:17 +0800 Subject: [PATCH] --- yaml --- r: 232988 b: refs/heads/master c: d0f69686c2ae775529aadc7a8acc6f13ad41de66 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/acl.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dc55eb223527..b092510f9d73 100644 --- 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 index 2222d161c7b6..3c52fc8afe29 100644 --- 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))