projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
15e7000
)
Btrfs: handle ERR_PTR from posix_acl_from_xattr()
author
Dan Carpenter
<error27@gmail.com>
Sat, 29 May 2010 09:48:35 +0000
(09:48 +0000)
committer
Chris Mason
<chris.mason@oracle.com>
Fri, 11 Jun 2010 19:57:39 +0000
(15:57 -0400)
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>
fs/btrfs/acl.c
patch
|
blob
|
history
diff --git
a/fs/btrfs/acl.c
b/fs/btrfs/acl.c
index a372985b3a9a2a7b31115d95258d3f4b1609af70..1606dc1e8d4a5ab42ed9b129ca060b4c0f653700 100644
(file)
--- 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);