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

Commit 9f032e0b authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Neeraj Soni
Browse files

f2fs/ICE: enable ICE in f2fs 



This patch enables ICE for f2fs.
f2fs/fscrypt-ice: fix memory leak in read path

Bug: 68721442
Bug: 68995224
Bug: 68721442
Change-Id: I5d64c5d0ca198f05cb71a06b62b5919d8ab4ab22
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@google.com>
Signed-off-by: default avatarNeeraj Soni <neersoni@codeaurora.org>
parent 4595c095

fs/f2fs/data.c

+2 −1
Original line number Diff line number Diff line
@@ -570,7 +570,8 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, 
	bio->bi_end_io = f2fs_read_end_io;

	bio_set_op_attrs(bio, REQ_OP_READ, 0);



	if (f2fs_encrypted_file(inode))

	if (f2fs_encrypted_file(inode) &&

		!fscrypt_using_hardware_encryption(inode))

		post_read_steps |= 1 << STEP_DECRYPT;

	if (post_read_steps) {

		ctx = mempool_alloc(bio_post_read_ctx_pool, GFP_NOFS);

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -3281,7 +3281,7 @@ static inline bool f2fs_may_encrypt(struct inode *inode) 


static inline bool f2fs_force_buffered_io(struct inode *inode, int rw)

{

	return ((f2fs_post_read_required(inode) &&

	return ((f2fs_encrypted_file(inode) &&

		!fscrypt_using_hardware_encryption(inode)) ||

			(rw == WRITE && test_opt(F2FS_I_SB(inode), LFS)) ||

			F2FS_I_SB(inode)->s_ndevs);