Backport a lazytime fix from upstream to 4.19-stable. The first commit had a trivial conflict in fs/xfs/ due to a file being renamed. Following that, the second commit is a clean cherry-pick. Eric Biggers (1): fs: fix lazytime expiration handling in __writeback_single_inode() Jan Kara (1): writeback: Drop I_DIRTY_TIME_EXPIRE fs/ext4/inode.c | 2 +- fs/fs-writeback.c | 36 ++++++++++++++------------------ fs/xfs/xfs_trans_inode.c | 4 ++-- include/linux/fs.h | 1 - include/trace/events/writeback.h | 1 - 5 files changed, 19 insertions(+), 25 deletions(-) -- 2.30.0