diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-04-04 22:26:36 +0200 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-04-08 20:10:31 +0200 |
| commit | f83140c1467e22ba9ee9389bc4e6c3e117f2296e (patch) | |
| tree | 1c0b480efa801c3395f4e6f77a37926705933c3b /fs | |
| parent | Orangefs: fix ifnullfree.cocci warnings (diff) | |
| download | linux-f83140c1467e22ba9ee9389bc4e6c3e117f2296e.tar.xz linux-f83140c1467e22ba9ee9389bc4e6c3e117f2296e.zip | |
orangefs: clean up truncate ctime and mtime setting
The ctime and mtime are always updated on a successful ftruncate and
only updated on a successful truncate where the size changed.
We handle the ``if the size changed'' bit.
This matches FUSE's behavior.
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/orangefs/inode.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index 2382e267b49e..975a7966a446 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -204,22 +204,8 @@ static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr) if (ret != 0) return ret; - /* - * Only change the c/mtime if we are changing the size or we are - * explicitly asked to change it. This handles the semantic difference - * between truncate() and ftruncate() as implemented in the VFS. - * - * The regular truncate() case without ATTR_CTIME and ATTR_MTIME is a - * special case where we need to update the times despite not having - * these flags set. For all other operations the VFS set these flags - * explicitly if it wants a timestamp update. - */ - if (orig_size != i_size_read(inode) && - !(iattr->ia_valid & (ATTR_CTIME | ATTR_MTIME))) { - iattr->ia_ctime = iattr->ia_mtime = - current_fs_time(inode->i_sb); + if (orig_size != i_size_read(inode)) iattr->ia_valid |= ATTR_CTIME | ATTR_MTIME; - } return ret; } |