projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-misc-next-2017-01-30' of git://anongit.freedesktop.org/git/drm-misc...
[linux-block.git]
/
fs
/
fuse
/
dir.c
diff --git
a/fs/fuse/dir.c
b/fs/fuse/dir.c
index 1f7c732f32b07f1bab9e4961f16cb52ee9f09f70..811fd8929a18c1e330316202fd40ac58857ec3c7 100644
(file)
--- 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,
- m
ax
_t(u32, nsec, NSEC_PER_SEC - 1)
+ m
in
_t(u32, nsec, NSEC_PER_SEC - 1)
};
return get_jiffies_64() + timespec64_to_jiffies(&ts);