Commit ff4136e6 authored by Eric Biggers's avatar Eric Biggers Committed by Jan Kara
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent e20b14db

fs/fat/misc.c

+12 −11
Original line number Diff line number Diff line
@@ -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;



	if (flags & (S_ATIME | S_CTIME | S_MTIME)) {

		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 (dirty)

		iflags |= I_DIRTY_SYNC;

	__mark_inode_dirty(inode, iflags);

		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;



	__mark_inode_dirty(inode, dirty_flags);

	return 0;

}

EXPORT_SYMBOL_GPL(fat_update_time);