diff options
| author | Eric Biggers <ebiggers@google.com> | 2021-01-12 11:02:46 -0800 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2021-01-13 17:26:30 +0100 |
| commit | ff4136e64d129c4b617331d6c84a3e1781dda70d (patch) | |
| tree | 8fada5e412009d2cc26459f6710672b22dee78b7 /fs | |
| parent | e20b14db050ae25ef7c5a2d9a41dd62b7e5e75c1 (diff) | |
| download | linux-stable-ff4136e64d129c4b617331d6c84a3e1781dda70d.tar.gz linux-stable-ff4136e64d129c4b617331d6c84a3e1781dda70d.tar.bz2 linux-stable-ff4136e64d129c4b617331d6c84a3e1781dda70d.zip | |
fat: only specify I_DIRTY_TIME when needed in fat_update_time()
As was done for generic_update_time(), only pass I_DIRTY_TIME to
__mark_inode_dirty() when the inode's timestamps were actually updated
and lazytime is enabled. This avoids a weird edge case where
I_DIRTY_TIME could be set in i_state when lazytime isn't enabled.
Link: https://lore.kernel.org/r/20210112190253.64307-5-ebiggers@kernel.org
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fat/misc.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/fs/fat/misc.c b/fs/fat/misc.c index f1b2a1fc2a6a..18a50a46b57f 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c @@ -329,22 +329,23 @@ EXPORT_SYMBOL_GPL(fat_truncate_time); int fat_update_time(struct inode *inode, struct timespec64 *now, int flags) { - int iflags = I_DIRTY_TIME; - bool dirty = false; + int dirty_flags = 0; if (inode->i_ino == MSDOS_ROOT_INO) return 0; - fat_truncate_time(inode, now, flags); - if (flags & S_VERSION) - dirty = inode_maybe_inc_iversion(inode, false); - if ((flags & (S_ATIME | S_CTIME | S_MTIME)) && - !(inode->i_sb->s_flags & SB_LAZYTIME)) - dirty = true; + if (flags & (S_ATIME | S_CTIME | S_MTIME)) { + fat_truncate_time(inode, now, flags); + if (inode->i_sb->s_flags & SB_LAZYTIME) + dirty_flags |= I_DIRTY_TIME; + else + dirty_flags |= I_DIRTY_SYNC; + } + + if ((flags & S_VERSION) && inode_maybe_inc_iversion(inode, false)) + dirty_flags |= I_DIRTY_SYNC; - if (dirty) - iflags |= I_DIRTY_SYNC; - __mark_inode_dirty(inode, iflags); + __mark_inode_dirty(inode, dirty_flags); return 0; } EXPORT_SYMBOL_GPL(fat_update_time); |