diff --git a/[refs] b/[refs]
index eb5c706d97ad..2366cfa615c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25d7dfdaf3404bb31b8f55283fd2c456cb7b4001
+refs/heads/master: 685d16ddb07b74537fb18972784e6214840fdd20
diff --git a/trunk/fs/fuse/dir.c b/trunk/fs/fuse/dir.c
index 72a74cde6de8..6db66ec386ae 100644
--- a/trunk/fs/fuse/dir.c
+++ b/trunk/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;
 }
 
 /*