diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-05-25 01:20:31 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-05-25 01:20:31 +0300 |
| commit | c41d342b39f15acbdc61948bab0cb3c567ec992a (patch) | |
| tree | e92f0897e7fce3976672dec51bdf9b5da1839636 /fs/ext4 | |
| parent | d6b975504e7e71fc29fcd14530433e816d7f5aac (diff) | |
| download | linux-c41d342b39f15acbdc61948bab0cb3c567ec992a.tar.xz | |
ext4: remove redundant check for encrypted file on dio write path
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 <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: David Gstir <david@sigma-star.at>
Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 90b264928742..074aeba78259 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); |