From f73494247c361b5fe2ad05d47c69a39d124a735a Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Sun, 30 Jul 2006 03:04:08 -0700 Subject: [PATCH] --- yaml --- r: 32971 b: refs/heads/master c: 685d16ddb07b74537fb18972784e6214840fdd20 h: refs/heads/master i: 32969: 88b7a810c1fad67c673138282c91db7f5961c0d8 32967: 1a26d1a38e0eb03596493d15e3d2bc0b7cbf8c94 v: v3 --- [refs] | 2 +- trunk/fs/fuse/dir.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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; } /*