commit dc86248a26bb0a109193d5f456813deff8b0614a
author Neeraj Soni <neersoni@codeaurora.org> Mon Aug 05 20:02:19 2019 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 13 03:33:44 2019 -0700
tree a8593e290500b0982c073edb8dd23c19b0a02d23
parent 63361087b6db69d283cdbc93e149e6dcde90ca78

fs: crypto: fix issue introduced with lts-integration

Fix the perf issue introduced with wrong conflict resolution of
'commit 81b89766408b ("Merge android-4.9.175 (e2171b6) into msm-4.9")'.

Change-Id: I3b368c5efd8e297bbe6b5c6e3ad12389a0edde7e
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>

fs/ext4/inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index b5e1837..8cb2298 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3624,8 +3624,9 @@
 	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