fat: only specify I_DIRTY_TIME when needed in fat_update_time()
authorEric Biggers <ebiggers@google.com>
Tue, 12 Jan 2021 19:02:46 +0000 (11:02 -0800)
committerJan Kara <jack@suse.cz>
Wed, 13 Jan 2021 16:26:30 +0000 (17:26 +0100)
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>
fs/fat/misc.c

index f1b2a1f..18a50a4 100644 (file)
@@ -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);