diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-05-29 11:48:35 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-06-11 21:57:39 +0200 |
| commit | 834e74759a473f8101a273e843d1edec2778801d (patch) | |
| tree | f7009149bb1ca362737b2e6b7dc855326d90f079 /fs/btrfs | |
| parent | Btrfs: avoid BUG when dropping root and reference in same transaction (diff) | |
| download | linux-834e74759a473f8101a273e843d1edec2778801d.tar.xz linux-834e74759a473f8101a273e843d1edec2778801d.zip | |
Btrfs: handle ERR_PTR from posix_acl_from_xattr()
posix_acl_from_xattr() returns both ERR_PTRs and null, but it's OK to
pass null values to set_cached_acl()
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/acl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index a372985b3a9a..1606dc1e8d4a 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -60,6 +60,8 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type) size = __btrfs_getxattr(inode, name, value, size); if (size > 0) { acl = posix_acl_from_xattr(value, size); + if (IS_ERR(acl)) + return acl; set_cached_acl(inode, type, acl); } kfree(value); |