projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
fs
/
btrfs
/
acl.c
diff --git
a/fs/btrfs/acl.c
b/fs/btrfs/acl.c
index 44ea5b92e1ba891181235a24ba53785ff7acbfa0..f66fc99597331383890ac4847329faf6a494ddb0 100644
(file)
--- a/
fs/btrfs/acl.c
+++ b/
fs/btrfs/acl.c
@@
-288,7
+288,7
@@
int btrfs_acl_chmod(struct inode *inode)
return 0;
acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);
- if (IS_ERR
(acl) || !acl
)
+ if (IS_ERR
_OR_NULL(acl)
)
return PTR_ERR(acl);
clone = posix_acl_clone(acl, GFP_KERNEL);