OSDN Git Service

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.19.y' into android...
authorJaegeuk Kim <jaegeuk@google.com>
Wed, 24 Jun 2020 20:30:04 +0000 (13:30 -0700)
committerJaegeuk Kim <jaegeuk@google.com>
Wed, 24 Jun 2020 20:31:46 +0000 (13:31 -0700)
commitc95d6ed4e7e13c013ae85947e5d1f4ea05e22089
treeb857fa6b8a49143ccf7e77c34828262c74603e52
parent2cadb41ef50a8e3114bd1a7412c579bbec0ac863
parent00f6b03b4176b05c58ab06738c95555b1449cc02
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.19.y' into android-4.19-stable

This has one fix in advance merged in f2fs-stable.
("xfs: drop I_DIRTY_TIME_EXPIRED")

* aosp/upstream-f2fs-stable-linux-4.19.y:
  writeback: Drop I_DIRTY_TIME_EXPIRE
  writeback: Fix sync livelock due to b_dirty_time processing
  writeback: Avoid skipping inode writeback
  writeback: Protect inode->i_io_list with inode->i_lock
  Revert "writeback: Avoid skipping inode writeback"

Bug: 154542664
Change-Id: I98a6258cb60227e6ca02e57bf7adf28ab7816cbf
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
fs/ext4/inode.c
fs/fs-writeback.c
fs/xfs/xfs_trans_inode.c
include/linux/fs.h