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

Commit 242a068a authored Feb 10, 2020 by Jaegeuk Kim

ANDROID: f2fs: fix missing blk-crypto changes

I missed to fix blk-crypto changes that should be applied in compression flow.

Fixes: dad710c5 ("Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14")
Change-Id: Icdf8e0561c6f377fa23ab38cc8c57c2365b297d3
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>

parent 224ac0ed

fs/f2fs/compress.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -836,6 +836,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
		err = f2fs_encrypt_one_page(&fio);
		if (err)
		goto out_destroy_crypt;
		if (fscrypt_inode_uses_fs_layer_crypto(inode))
		cc->cpages[i] = fio.encrypted_page;
		}
		}
		@@ -876,7 +877,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,

		f2fs_bug_on(fio.sbi, blkaddr == NULL_ADDR);

		if (fio.encrypted)
		if (fio.encrypted && fscrypt_inode_uses_fs_layer_crypto(inode))
		fio.encrypted_page = cc->cpages[i - 1];
		else
		fio.compressed_page = cc->cpages[i - 1];

fs/f2fs/data.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -2187,8 +2187,9 @@ int f2fs_read_multi_pages(struct compress_ctx cc, struct bio *bio_ret,
		blkaddr = datablock_addr(dn.inode, dn.node_page,
		dn.ofs_in_node + i + 1);

		if (bio && !page_is_mergeable(sbi, bio,
		*last_block_in_bio, blkaddr)) {
		if (bio && (!page_is_mergeable(sbi, bio,
		*last_block_in_bio, blkaddr) \|\|
		!f2fs_crypt_mergeable_bio(bio, inode, page->index, NULL))) {
		submit_and_realloc:
		__submit_bio(sbi, bio, DATA);
		bio = NULL;