diff options
| author | Linus Torvalds | 2019-05-07 20:50:27 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-05-07 20:50:27 -0700 |
| commit | 149e703cb8bfcbdae46140b108bb6f7d2407df8f (patch) | |
| tree | 6fdea7cdd4fb54a272cb7dc3c46cb9f2b84059e9 /fs/inode.c | |
| parent | d897166d8598e362a31d79dfd9a1e2eedb9ac85c (diff) | |
| parent | 6ee9706aa22e026f438caabb2982e5f78de2c82c (diff) | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff, with no common topic whatsoever..."
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
libfs: document simple_get_link()
Documentation/filesystems/Locking: fix ->get_link() prototype
Documentation/filesystems/vfs.txt: document how ->i_link works
Documentation/filesystems/vfs.txt: remove bogus "Last updated" date
fs: use timespec64 in relatime_need_update
fs/block_dev.c: remove unused include
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c index 16b10e53292e..e9d18b2c3f91 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1613,7 +1613,7 @@ EXPORT_SYMBOL(bmap); * passed since the last atime update. */ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, - struct timespec now) + struct timespec64 now) { if (!(mnt->mnt_flags & MNT_RELATIME)) @@ -1714,7 +1714,7 @@ bool atime_needs_update(const struct path *path, struct inode *inode) now = current_time(inode); - if (!relatime_need_update(mnt, inode, timespec64_to_timespec(now))) + if (!relatime_need_update(mnt, inode, now)) return false; if (timespec64_equal(&inode->i_atime, &now)) |