diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-01-28 22:24:59 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-01-28 22:24:59 +0100 |
| commit | eab49bec41136460b12ac0fbeceeb88386d538c7 (patch) | |
| tree | d2ad3e163407d7779d53fdaa0dedcc3b934106de /fs/btrfs/acl.c | |
| parent | Btrfs: forced readonly mounts on errors (diff) | |
| parent | Btrfs: Fix file clone when source offset is not 0 (diff) | |
| download | linux-eab49bec41136460b12ac0fbeceeb88386d538c7.tar.xz linux-eab49bec41136460b12ac0fbeceeb88386d538c7.zip | |
Merge branch 'bug-fixes' of git://repo.or.cz/linux-btrfs-devel into btrfs-38
Diffstat (limited to 'fs/btrfs/acl.c')
| -rw-r--r-- | fs/btrfs/acl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 6d1410e392d3..889ce1348e64 100644 --- a/fs/btrfs/acl.c +++ b/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; @@ -84,6 +87,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)) |