This should be a no-op now, but once inode writeback works, it'll be
necessary to have the correct attribute in the dirty inode.
Previously the attribute fetch timeout was marked invalid and the server
provided the updated attribute. When the inode is dirty, the server
cannot be consulted since it does not yet know the pending setattr.
Signed-off-by: Martin Brandenburg <martin@xxxxxxxxxxxx>
---
fs/orangefs/file.c | 10 ++--------
fs/orangefs/namei.c | 7 ++++++-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index e1b9880e2b5f..ad615d149683 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -321,14 +321,8 @@ static ssize_t do_readv_writev(enum ORANGEFS_io_type type, struct file *file,
file_accessed(file);
} else {
file_update_time(file);
- /*
- * Must invalidate to ensure write loop doesn't
- * prevent kernel from reading updated
- * attribute. Size probably changed because of
- * the write, and other clients could update
- * any other attribute.
- */
- orangefs_inode->getattr_time = jiffies - 1;
+ if (*offset > i_size_read(inode))
+ i_size_write(inode, *offset);
}
}
diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index 8f1c6e6d3ee1..b6c3d742f35b 100644
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -425,6 +425,7 @@ static int orangefs_rename(struct inode *old_dir,
unsigned int flags)
{
struct orangefs_kernel_op_s *new_op;
+ struct iattr iattr;
int ret;
if (flags)
@@ -434,7 +435,11 @@ 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 = jiffies - 1;
+ new_dir->i_mtime = new_dir->i_ctime = current_time(new_dir);
+ memset(&iattr, 0, sizeof iattr);
+ iattr.ia_valid |= ATTR_MTIME;
+ orangefs_inode_setattr(new_dir, &iattr);
+ mark_inode_dirty_sync(new_dir);
new_op = op_alloc(ORANGEFS_VFS_OP_RENAME);
if (!new_op)
--
2.16.2
