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]
/
security
/
inode.c
diff --git
a/security/inode.c
b/security/inode.c
index
acc3e9c
..
c83db05
100644
(file)
--- a/
security/inode.c
+++ b/
security/inode.c
@@
-117,7
+117,7
@@
struct dentry *securityfs_create_file(const char *name, umode_t mode,
inode->i_ino = get_next_ino();
inode->i_mode = mode;
inode->i_ino = get_next_ino();
inode->i_mode = mode;
- inode->i_atime = inode->i_mtime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_atime = inode->i_mtime = inode->i_ctime =
current_time(inode)
;
inode->i_private = data;
if (is_dir) {
inode->i_op = &simple_dir_inode_operations;
inode->i_private = data;
if (is_dir) {
inode->i_op = &simple_dir_inode_operations;