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
/
inode.c
diff --git
a/fs/jfs/inode.c
b/fs/jfs/inode.c
index
ad3e7b1
..
054cc76
100644
(file)
--- a/
fs/jfs/inode.c
+++ b/
fs/jfs/inode.c
@@
-403,7
+403,7
@@
void jfs_truncate_nolock(struct inode *ip, loff_t length)
break;
}
- ip->i_mtime = ip->i_ctime =
CURRENT_TIME
;
+ ip->i_mtime = ip->i_ctime =
current_time(ip)
;
mark_inode_dirty(ip);
txCommit(tid, 1, &ip, 0);