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
/
ufs
/
ialloc.c
diff --git
a/fs/ufs/ialloc.c
b/fs/ufs/ialloc.c
index
fd0203c
..
9774555
100644
(file)
--- a/
fs/ufs/ialloc.c
+++ b/
fs/ufs/ialloc.c
@@
-290,7
+290,7
@@
cg_found:
inode_init_owner(inode, dir, mode);
inode->i_blocks = 0;
inode->i_generation = 0;
inode_init_owner(inode, dir, mode);
inode->i_blocks = 0;
inode->i_generation = 0;
- inode->i_mtime = inode->i_atime = inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_mtime = inode->i_atime = inode->i_ctime =
current_time(inode)
;
ufsi->i_flags = UFS_I(dir)->i_flags;
ufsi->i_lastfrag = 0;
ufsi->i_shadow = 0;
ufsi->i_flags = UFS_I(dir)->i_flags;
ufsi->i_lastfrag = 0;
ufsi->i_shadow = 0;