f2fs: don't keep META_MAPPING pages used for moving verity file blocks

META_MAPPING is used to move blocks for both encrypted and verity files.
So the META_MAPPING invalidation condition in do_checkpoint() should
consider verity too, not just encrypt.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Eric Biggers 2019-12-09 12:00:55 -08:00 committed by Jaegeuk Kim
parent f543805fcd
commit 542989b674

View File

@ -1509,10 +1509,10 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
f2fs_wait_on_all_pages_writeback(sbi); f2fs_wait_on_all_pages_writeback(sbi);
/* /*
* invalidate intermediate page cache borrowed from meta inode * invalidate intermediate page cache borrowed from meta inode which are
* which are used for migration of encrypted inode's blocks. * used for migration of encrypted or verity inode's blocks.
*/ */
if (f2fs_sb_has_encrypt(sbi)) if (f2fs_sb_has_encrypt(sbi) || f2fs_sb_has_verity(sbi))
invalidate_mapping_pages(META_MAPPING(sbi), invalidate_mapping_pages(META_MAPPING(sbi),
MAIN_BLKADDR(sbi), MAX_BLKADDR(sbi) - 1); MAIN_BLKADDR(sbi), MAX_BLKADDR(sbi) - 1);