---

yaml --- r: 32971 b: refs/heads/master c: 685d16d h: refs/heads/master i: 32969: 88b7a81 32967: 1a26d1a v: v3
git-mirror · Jul 31, 2006 · f734942 · f734942
1 parent 74da5ef
commit f734942
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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;
 }
 
 /*