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

Commit 4b0524aa authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: allow unlocked direct IO when pages are cached 



Currently we do not allow unlocked (meaning without inode_lock) direct
IO when the file has any pages cached. This check is not needed anymore
as we keep inode lock until ext4_direct_IO_write() and thus can happily
writeback and evict any pages conflicting with current direct IO write.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 9a200d07

fs/ext4/file.c

+1 −2
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ ext4_unaligned_aio(struct inode *inode, struct iov_iter *from, loff_t pos) 
static ssize_t

ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)

{

	struct file *file = iocb->ki_filp;

	struct inode *inode = file_inode(iocb->ki_filp);

	struct blk_plug plug;

	int o_direct = iocb->ki_flags & IOCB_DIRECT;
@@ -138,7 +137,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 


		/* check whether we do a DIO overwrite or not */

		if (ext4_should_dioread_nolock(inode) && !unaligned_aio &&

		    !file->f_mapping->nrpages && pos + length <= i_size_read(inode)) {

		    pos + length <= i_size_read(inode)) {

			struct ext4_map_blocks map;

			unsigned int blkbits = inode->i_blkbits;

			int err, len;