[PATCH] fuse: fix zero timeout

[deliverable/linux.git] / fs / fuse / dir.c

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 72a74cde6de8c288793293d4e4ca4bb4ea58b793..6db66ec386aef2d61873d3cacea3509a55c2741e 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -25,8 +25,11 @@
  */
 static unsigned long time_to_jiffies(unsigned long sec, unsigned long nsec)
 {
-       struct timespec ts = {sec, nsec};
-       return jiffies + timespec_to_jiffies(&ts);
+       if (sec || nsec) {
+               struct timespec ts = {sec, nsec};
+               return jiffies + timespec_to_jiffies(&ts);
+       } else
+               return jiffies - 1;
 }
 
 /*