Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 685d16dd authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

[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: default avatarMiklos Szeredi <miklos@szeredi.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 25d7dfda
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -25,8 +25,11 @@
 */
static unsigned long time_to_jiffies(unsigned long sec, unsigned long nsec)
{
	if (sec || nsec) {
		struct timespec ts = {sec, nsec};
		return jiffies + timespec_to_jiffies(&ts);
	} else
		return jiffies - 1;
}

/*