Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
fs
/
gfs2
/
acl.c
diff --git
a/kernel/fs/gfs2/acl.c
b/kernel/fs/gfs2/acl.c
index
1be3b06
..
ff0ac96
100644
(file)
--- a/
kernel/fs/gfs2/acl.c
+++ b/
kernel/fs/gfs2/acl.c
@@
-79,17
+79,11
@@
int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
if (type == ACL_TYPE_ACCESS) {
umode_t mode = inode->i_mode;
if (type == ACL_TYPE_ACCESS) {
umode_t mode = inode->i_mode;
- error = posix_acl_
equiv_mode(acl, &mode
);
- if (error
< 0
)
+ error = posix_acl_
update_mode(inode, &inode->i_mode, &acl
);
+ if (error)
return error;
return error;
-
- if (error == 0)
- acl = NULL;
-
- if (mode != inode->i_mode) {
- inode->i_mode = mode;
+ if (mode != inode->i_mode)
mark_inode_dirty(inode);
mark_inode_dirty(inode);
- }
}
if (acl) {
}
if (acl) {