projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sctp: validate chunk len before actually using it
[cascardo/linux.git]
/
fs
/
reiserfs
/
xattr_acl.c
diff --git
a/fs/reiserfs/xattr_acl.c
b/fs/reiserfs/xattr_acl.c
index
dbed42f
..
3d2256a
100644
(file)
--- a/
fs/reiserfs/xattr_acl.c
+++ b/
fs/reiserfs/xattr_acl.c
@@
-242,13
+242,9
@@
__reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
case ACL_TYPE_ACCESS:
name = XATTR_NAME_POSIX_ACL_ACCESS;
if (acl) {
case ACL_TYPE_ACCESS:
name = XATTR_NAME_POSIX_ACL_ACCESS;
if (acl) {
- error = posix_acl_
equiv_mode(acl, &inode->i_mode
);
- if (error
< 0
)
+ error = posix_acl_
update_mode(inode, &inode->i_mode, &acl
);
+ if (error)
return error;
return error;
- else {
- if (error == 0)
- acl = NULL;
- }
}
break;
case ACL_TYPE_DEFAULT:
}
break;
case ACL_TYPE_DEFAULT:
@@
-277,7
+273,7
@@
__reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
if (error == -ENODATA) {
error = 0;
if (type == ACL_TYPE_ACCESS) {
if (error == -ENODATA) {
error = 0;
if (type == ACL_TYPE_ACCESS) {
- inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_ctime =
current_time(inode)
;
mark_inode_dirty(inode);
}
}
mark_inode_dirty(inode);
}
}