From: Miklos Szeredi <miklos@szeredi.hu>
Date: Sun, 30 Jul 2006 10:04:08 +0000 (-0700)
Subject: [PATCH] fuse: fix zero timeout
X-Git-Tag: v2.6.18-rc4~89
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=685d16ddb07b74537fb18972784e6214840fdd20;p=linux-2.6

[PATCH] fuse: fix zero timeout

An attribute and entry timeout of zero should mean, that the entity is
invalidated immediately after the operation.  Previously invalidation only
happened at the next clock tick.

Reported and tested by Craig Davies.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 72a74cde6d..6db66ec386 100644
--- 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;
 }
 
 /*