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

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

Merge "ext4 crypto: added support for O_DIRECT flag"

parents 70514ec3 0ea43de2

fs/ext4/inode.c

+6 −2
Original line number Diff line number Diff line
@@ -3253,7 +3253,9 @@ static ssize_t ext4_ext_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 
		get_block_func = ext4_get_block_write;

		dio_flags = DIO_LOCKING;

	}

#ifdef CONFIG_EXT4_FS_ENCRYPTION

#if defined(CONFIG_EXT4_FS_ENCRYPTION) && \

!defined(CONFIG_EXT4_FS_ICE_ENCRYPTION)



	BUG_ON(ext4_encrypted_inode(inode) && S_ISREG(inode->i_mode));

#endif

	if (IS_DAX(inode))
@@ -3320,7 +3322,9 @@ static ssize_t ext4_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 
	size_t count = iov_iter_count(iter);

	ssize_t ret;



#ifdef CONFIG_EXT4_FS_ENCRYPTION

#if defined(CONFIG_EXT4_FS_ENCRYPTION) && \

!defined(CONFIG_EXT4_FS_ICE_ENCRYPTION)



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

		return 0;

#endif