orangefs: Account for jiffies wraparound.

Signed-off-by: Martin Brandenburg <martin@omnibond.com>

diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c
index 2521af6..00235bf 100644 (file)
--- a/fs/orangefs/dcache.c
+++ b/fs/orangefs/dcache.c
@@ -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)

diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index 77071b7..62c5259 100644 (file)
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -73,7 +73,7 @@ static int orangefs_create(struct inode *dir,
        d_instantiate(dentry, inode);
        unlock_new_inode(inode);
        dentry->d_time = jiffies + dcache_timeout_msecs*HZ/1000;
-       ORANGEFS_I(inode)->getattr_time = 0;
+       ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
        gossip_debug(GOSSIP_NAME_DEBUG,
                     "%s: dentry instantiated for %s\n",
@@ -193,7 +193,7 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
                goto out;
        }
 
-       ORANGEFS_I(inode)->getattr_time = 0;
+       ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
        gossip_debug(GOSSIP_NAME_DEBUG,
                     "%s:%s:%d "
@@ -323,7 +323,7 @@ static int orangefs_symlink(struct inode *dir,
        d_instantiate(dentry, inode);
        unlock_new_inode(inode);
        dentry->d_time = jiffies + dcache_timeout_msecs*HZ/1000;
-       ORANGEFS_I(inode)->getattr_time = 0;
+       ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
        gossip_debug(GOSSIP_NAME_DEBUG,
                     "Inode (Symlink) %pU -> %s\n",
@@ -387,7 +387,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 + dcache_timeout_msecs*HZ/1000;
-       ORANGEFS_I(inode)->getattr_time = 0;
+       ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
        gossip_debug(GOSSIP_NAME_DEBUG,
                     "Inode (Directory) %pU -> %s\n",
@@ -418,7 +418,7 @@ static int orangefs_rename(struct inode *old_dir,
                     "orangefs_rename: called (%pd2 => %pd2) ct=%d\n",
                     old_dentry, new_dentry, d_count(new_dentry));
 
-       ORANGEFS_I(new_dentry->d_parent->d_inode)->getattr_time = 0;
+       ORANGEFS_I(new_dentry->d_parent->d_inode)->getattr_time = jiffies - 1;
 
        new_op = op_alloc(ORANGEFS_VFS_OP_RENAME);
        if (!new_op)

diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index cd512a3..d13c729 100644 (file)
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -262,7 +262,7 @@ int orangefs_inode_getattr(struct inode *inode, int new, int bypass)
            get_khandle_from_ino(inode));
 
        if (!new && !bypass) {
-               if (orangefs_inode->getattr_time > jiffies)
+               if (time_before(jiffies, orangefs_inode->getattr_time))
                        return 0;
        }
 
@@ -421,7 +421,7 @@ int orangefs_inode_setattr(struct inode *inode, struct iattr *iattr)
                ClearMtimeFlag(orangefs_inode);
                ClearCtimeFlag(orangefs_inode);
                ClearModeFlag(orangefs_inode);
-               orangefs_inode->getattr_time = 0;
+               orangefs_inode->getattr_time = jiffies - 1;
        }
 
        return ret;