author: David Sheets <david.sheets@docker.com> 2017-01-13 15:58:30 +0000
committer: Miklos Szeredi <mszeredi@redhat.com> 2017-01-13 17:20:47 +0100
commit: 210675270caa33253e4c33f3c5e657e7d6060812
parent: a8a86d78d673b1c99fe9b0064739fde9e9774184
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 1 deletion
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 1f7c732f32b0..811fd8929a18 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -68,7 +68,7 @@ static u64 time_to_jiffies(u64 sec, u32 nsec)
if (sec || nsec) {
struct timespec64 ts = {
sec,
- max_t(u32, nsec, NSEC_PER_SEC - 1)
+ min_t(u32, nsec, NSEC_PER_SEC - 1)
};
return get_jiffies_64() + timespec64_to_jiffies(&ts);