Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbe0c26 authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent bf107311

fs/f2fs/checkpoint.c

+3 −3
Original line number Diff line number Diff line
@@ -1509,10 +1509,10 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	f2fs_wait_on_all_pages_writeback(sbi);



	/*

	 * invalidate intermediate page cache borrowed from meta inode

	 * which are used for migration of encrypted inode's blocks.

	 * invalidate intermediate page cache borrowed from meta inode which are

	 * 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),

				MAIN_BLKADDR(sbi), MAX_BLKADDR(sbi) - 1);