Merge "f2fs: Skip force_buffered_io when ICE is enabled" (3cf60774) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/f2fs/f2fs.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -3516,7 +3516,8 @@ static inline void f2fs_set_encrypted_inode(struct inode *inode)
		*/
		static inline bool f2fs_post_read_required(struct inode *inode)
		{
		return f2fs_encrypted_file(inode);
		return (f2fs_encrypted_file(inode)
		&& !fscrypt_using_hardware_encryption(inode));
		}

		#define F2FS_FEATURE_FUNCS(name, flagname) \
		@@ -3619,10 +3620,6 @@ static inline bool f2fs_force_buffered_io(struct inode *inode,
		struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
		int rw = iov_iter_rw(iter);

		if ((f2fs_encrypted_file(inode)) &&
		!fscrypt_using_hardware_encryption(inode))
		return true;

		if (f2fs_post_read_required(inode))
		return true;
		if (sbi->s_ndevs)