diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-17 09:38:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-17 09:38:39 -0700 |
commit | 46e62a072a8254e9e3765fdc999aba325b7918df (patch) | |
tree | e60e7dd3a12d07ea49d53341838f8c46e484ef5b /fs/ext2/inode.c | |
parent | 5c60a7389d795e001c8748b458eb76e3a5b6008c (diff) | |
parent | fe2c32545bfc281122cb8b66572949a366ad747e (diff) | |
download | linux-46e62a072a8254e9e3765fdc999aba325b7918df.tar.gz linux-46e62a072a8254e9e3765fdc999aba325b7918df.tar.bz2 linux-46e62a072a8254e9e3765fdc999aba325b7918df.zip |
Merge tag 'for_v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF and ext2 update from Jan Kara.
* tag 'for_v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ext2: use ktime_get_real_seconds for timestamps
udf: convert inode stamps to timespec64
Diffstat (limited to 'fs/ext2/inode.c')
-rw-r--r-- | fs/ext2/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 71635909df3b..7f7ee18fe179 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -86,7 +86,7 @@ void ext2_evict_inode(struct inode * inode) if (want_delete) { sb_start_intwrite(inode->i_sb); /* set dtime */ - EXT2_I(inode)->i_dtime = get_seconds(); + EXT2_I(inode)->i_dtime = ktime_get_real_seconds(); mark_inode_dirty(inode); __ext2_write_inode(inode, inode_needs_sync(inode)); /* truncate to 0 */ |