Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / fs / orangefs / dcache.c

diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c
index dcb55bb..00235bf 100644 (file)
--- a/fs/orangefs/dcache.c
+++ b/fs/orangefs/dcache.c
@@ -73,7 +73,7 @@ static int orangefs_revalidate_lookup(struct dentry *dentry)
                }
        }
 
-       dentry->d_time = jiffies + HZ;
+       dentry->d_time = jiffies + dcache_timeout_msecs*HZ/1000;
        ret = 1;
 out_release_op:
        op_release(new_op);
@@ -95,7 +95,7 @@ static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags)
 {
        int ret;
 
-       if (dentry->d_time > jiffies)
+       if (time_before(jiffies, dentry->d_time))
                return 1;
 
        if (flags & LOOKUP_RCU)