projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
acl.c
diff --git
a/fs/btrfs/acl.c
b/fs/btrfs/acl.c
index e15d2b0d8d3b20f3085c18348e9d711682fedc24..0890c83643e944f69e43a22f4151e381e7503f04 100644
(file)
--- a/
fs/btrfs/acl.c
+++ b/
fs/btrfs/acl.c
@@
-229,7
+229,7
@@
int btrfs_init_acl(struct btrfs_trans_handle *trans,
if (ret > 0) {
/* we need an acl */
ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
- } else {
+ } else
if (ret < 0)
{
cache_no_acl(inode);
}
} else {