aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/dir.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 72a74cde6de8..6db66ec386ae 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -25,8 +25,11 @@
25 */ 25 */
26static unsigned long time_to_jiffies(unsigned long sec, unsigned long nsec) 26static unsigned long time_to_jiffies(unsigned long sec, unsigned long nsec)
27{ 27{
28 struct timespec ts = {sec, nsec}; 28 if (sec || nsec) {
29 return jiffies + timespec_to_jiffies(&ts); 29 struct timespec ts = {sec, nsec};
30 return jiffies + timespec_to_jiffies(&ts);
31 } else
32 return jiffies - 1;
30} 33}
31 34
32/* 35/*