diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-07-28 14:46:36 -0400 |
|---|---|---|
| committer | Martin Brandenburg <martin@omnibond.com> | 2016-08-02 15:39:13 -0400 |
| commit | 8bbb20a863ca72dfb9025a4653f21b5abf926d20 (patch) | |
| tree | d4fd9ecb8da7f69ca9e474e003cb2896808121ef | |
| parent | 957ee43718c5a226fa70ef5e680d037ca9156af6 (diff) | |
orangefs: Account for jiffies wraparound.
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
| -rw-r--r-- | fs/orangefs/dcache.c | 2 | ||||
| -rw-r--r-- | fs/orangefs/namei.c | 10 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-utils.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c index 2521af6707f7..00235bf644dc 100644 --- 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 77071b78816a..62c525936ee8 100644 --- 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 cd512a3a9c52..d13c7291fd05 100644 --- 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; |