diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2018-02-12 15:49:24 +0000 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2019-05-03 14:32:38 -0400 |
| commit | 5e7f1d433804450cdb5ba478d26742963e06b1bc (patch) | |
| tree | 9c8295484d848ee28d4b5ba9173f5a72cfabad78 /fs/orangefs | |
| parent | 8b60785c1d7c63415c32bf64dabc686b9045ce7d (diff) | |
| download | linux-5e7f1d433804450cdb5ba478d26742963e06b1bc.tar.gz linux-5e7f1d433804450cdb5ba478d26742963e06b1bc.tar.bz2 linux-5e7f1d433804450cdb5ba478d26742963e06b1bc.zip | |
orangefs: update attributes rather than relying on server
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@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs')
| -rw-r--r-- | fs/orangefs/file.c | 10 | ||||
| -rw-r--r-- | 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 b0688ea894a4..a9e69c56d2fb 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -327,14 +327,8 @@ out: 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 87584d79ca7a..140314b76e10 100644 --- a/fs/orangefs/namei.c +++ b/fs/orangefs/namei.c @@ -383,6 +383,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) @@ -392,7 +393,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) |