3 files changed, 14 insertions, 6 deletions

diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c
index 1e8fe844e69f..5355efba4bc8 100644
--- 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 + orangefs_dcache_timeout_msecs*HZ/1000;
+        orangefs_set_timeout(dentry);
         ret = 1;
 out_release_op:
         op_release(new_op);
@@ -94,8 +94,9 @@ out_drop:
 static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags)
 {
         int ret;
+        unsigned long time = (unsigned long) dentry->d_fsdata;
 
-        if (time_before(jiffies, dentry->d_time))
+        if (time_before(jiffies, time))
                 return 1;
 
         if (flags & LOOKUP_RCU)
diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index d15d3d2dba62..a290ff6ec756 100644
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -72,7 +72,7 @@ static int orangefs_create(struct inode *dir,
 
         d_instantiate(dentry, inode);
         unlock_new_inode(inode);
-        dentry->d_time = jiffies + orangefs_dcache_timeout_msecs*HZ/1000;
+        orangefs_set_timeout(dentry);
         ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
         gossip_debug(GOSSIP_NAME_DEBUG,
@@ -183,7 +183,7 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
                 goto out;
         }
 
-        dentry->d_time = jiffies + orangefs_dcache_timeout_msecs*HZ/1000;
+        orangefs_set_timeout(dentry);
 
         inode = orangefs_iget(dir->i_sb, &new_op->downcall.resp.lookup.refn);
         if (IS_ERR(inode)) {
@@ -322,7 +322,7 @@ static int orangefs_symlink(struct inode *dir,
 
         d_instantiate(dentry, inode);
         unlock_new_inode(inode);
-        dentry->d_time = jiffies + orangefs_dcache_timeout_msecs*HZ/1000;
+        orangefs_set_timeout(dentry);
         ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
         gossip_debug(GOSSIP_NAME_DEBUG,
@@ -386,7 +386,7 @@ static int orangefs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
 
         d_instantiate(dentry, inode);
         unlock_new_inode(inode);
-        dentry->d_time = jiffies + orangefs_dcache_timeout_msecs*HZ/1000;
+        orangefs_set_timeout(dentry);
         ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
         gossip_debug(GOSSIP_NAME_DEBUG,
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index 0a82048f3aaf..3bf803d732c5 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -580,4 +580,11 @@ static inline void orangefs_i_size_write(struct inode *inode, loff_t i_size)
 #endif
 }
 
+static inline void orangefs_set_timeout(struct dentry *dentry)
+{
+        unsigned long time = jiffies + orangefs_dcache_timeout_msecs*HZ/1000;
+
+        dentry->d_fsdata = (void *) time;
+}
+
 #endif /* __ORANGEFSKERNEL_H */