projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
jfs
/
acl.c
diff --git
a/fs/jfs/acl.c
b/fs/jfs/acl.c
index
3a1e155
..
7bc186f
100644
(file)
--- a/
fs/jfs/acl.c
+++ b/
fs/jfs/acl.c
@@
-81,7
+81,7
@@
static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
rc = posix_acl_update_mode(inode, &inode->i_mode, &acl);
if (rc)
return rc;
- inode->i_ctime =
CURRENT_TIME
;
+ inode->i_ctime =
current_time(inode)
;
mark_inode_dirty(inode);
}
break;