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]
/
drivers
/
misc
/
ibmasm
/
ibmasmfs.c
diff --git
a/drivers/misc/ibmasm/ibmasmfs.c
b/drivers/misc/ibmasm/ibmasmfs.c
index
9c677f3
..
520f584
100644
(file)
--- a/
drivers/misc/ibmasm/ibmasmfs.c
+++ b/
drivers/misc/ibmasm/ibmasmfs.c
@@
-144,7
+144,7
@@
static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode)
if (ret) {
ret->i_ino = get_next_ino();
ret->i_mode = mode;
- ret->i_atime = ret->i_mtime = ret->i_ctime =
CURRENT_TIME
;
+ ret->i_atime = ret->i_mtime = ret->i_ctime =
current_time(ret)
;
}
return ret;
}