From: Eric Biggers Subject: [PATCH] ext4: remove redundant check for encrypted file on dio write path Date: Mon, 22 May 2017 17:53:16 -0700 Message-ID: <20170523005316.18996-1-ebiggers3@gmail.com> Cc: Theodore Ts'o , linux-fscrypt@vger.kernel.org, Eric Biggers To: linux-ext4@vger.kernel.org Return-path: Received: from mail-pf0-f193.google.com ([209.85.192.193]:32830 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752580AbdEWAy3 (ORCPT ); Mon, 22 May 2017 20:54:29 -0400 Sender: linux-ext4-owner@vger.kernel.org List-ID: From: Eric Biggers Currently we don't allow direct I/O on encrypted regular files, so in such cases we return 0 early in ext4_direct_IO(). There was also an additional BUG_ON() check in ext4_direct_IO_write(), but it can never be hit because of the earlier check for the exact same condition in ext4_direct_IO(). There was also no matching check on the read path, which made the write path specific check seem very ad-hoc. Just remove the unnecessary BUG_ON(). Signed-off-by: Eric Biggers --- fs/ext4/inode.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 1bd0bfa547f6..7c6e715b4d2e 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3629,9 +3629,6 @@ static ssize_t ext4_direct_IO_write(struct kiocb *iocb, struct iov_iter *iter) get_block_func = ext4_dio_get_block_unwritten_async; dio_flags = DIO_LOCKING; } -#ifdef CONFIG_EXT4_FS_ENCRYPTION - BUG_ON(ext4_encrypted_inode(inode) && S_ISREG(inode->i_mode)); -#endif ret = __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter, get_block_func, ext4_end_io_dio, NULL, dio_flags); -- 2.13.0.303.g4ebf302169-goog