diff options
author | Jeff Layton <jlayton@redhat.com> | 2017-12-11 12:35:24 +0100 |
---|---|---|
committer | Jeff Layton <jlayton@redhat.com> | 2018-01-29 12:42:21 +0100 |
commit | 3a8c7231d53641a21d794c7406044e19ad299a00 (patch) | |
tree | 9fa581ae47fc8fe9c43667c039c8cc5e21ea7170 /fs/btrfs/inode.c | |
parent | xfs: avoid setting XFS_ILOG_CORE if i_version doesn't need incrementing (diff) | |
download | linux-3a8c7231d53641a21d794c7406044e19ad299a00.tar.xz linux-3a8c7231d53641a21d794c7406044e19ad299a00.zip |
btrfs: only dirty the inode in btrfs_update_time if something was changed
At this point, we know that "now" and the file times may differ, and we
suspect that the i_version has been flagged to be bumped. Attempt to
bump the i_version, and only mark the inode dirty if that actually
occurred or if one of the times was updated.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: David Sterba <dsterba@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Diffstat (limited to '')
-rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index ac8692849a81..76245323a7c8 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6107,19 +6107,20 @@ static int btrfs_update_time(struct inode *inode, struct timespec *now, int flags) { struct btrfs_root *root = BTRFS_I(inode)->root; + bool dirty = flags & ~S_VERSION; if (btrfs_root_readonly(root)) return -EROFS; if (flags & S_VERSION) - inode_inc_iversion(inode); + dirty |= inode_maybe_inc_iversion(inode, dirty); if (flags & S_CTIME) inode->i_ctime = *now; if (flags & S_MTIME) inode->i_mtime = *now; if (flags & S_ATIME) inode->i_atime = *now; - return btrfs_dirty_inode(inode); + return dirty ? btrfs_dirty_inode(inode) : 0; } /* |