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
/
super.c
diff --git
a/fs/jfs/super.c
b/fs/jfs/super.c
index
cec8814
..
85671f7
100644
(file)
--- a/
fs/jfs/super.c
+++ b/
fs/jfs/super.c
@@
-830,7
+830,7
@@
out:
if (inode->i_size < off+len-towrite)
i_size_write(inode, off+len-towrite);
inode->i_version++;
if (inode->i_size < off+len-towrite)
i_size_write(inode, off+len-towrite);
inode->i_version++;
- inode->i_mtime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_mtime = inode->i_ctime =
current_time(inode)
;
mark_inode_dirty(inode);
inode_unlock(inode);
return len - towrite;
mark_inode_dirty(inode);
inode_unlock(inode);
return len - towrite;