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

Commit 2b215f14 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fs: crypto: fix issue introduced with lts-integration"

parents 5a914572 dc86248a

fs/ext4/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -3624,8 +3624,9 @@ static ssize_t ext4_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	ssize_t ret;

	int rw = iov_iter_rw(iter);



#ifdef CONFIG_FS_ENCRYPTION

	if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode))

#ifdef CONFIG_EXT4_FS_ENCRYPTION

	if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)

		&& !fscrypt_using_hardware_encryption(inode))

		return 0;

#endif