Commit eacdf4ea authored by Al Viro's avatar Al Viro
Browse files

btrfs: use IOMAP_DIO_NOSYNC 



... instead of messing with iocb flags

Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 36518b6b

fs/btrfs/file.c

+0 −17
Original line number Diff line number Diff line
@@ -1848,7 +1848,6 @@ static ssize_t check_direct_IO(struct btrfs_fs_info *fs_info, 


static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)

{

	const bool is_sync_write = (iocb->ki_flags & IOCB_DSYNC);

	struct file *file = iocb->ki_filp;

	struct inode *inode = file_inode(file);

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
@@ -1901,15 +1900,6 @@ static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from) 
		goto buffered;

	}



	/*

	 * We remove IOCB_DSYNC so that we don't deadlock when iomap_dio_rw()

	 * calls generic_write_sync() (through iomap_dio_complete()), because

	 * that results in calling fsync (btrfs_sync_file()) which will try to

	 * lock the inode in exclusive/write mode.

	 */

	if (is_sync_write)

		iocb->ki_flags &= ~IOCB_DSYNC;



	/*

	 * The iov_iter can be mapped to the same file range we are writing to.

	 * If that's the case, then we will deadlock in the iomap code, because
@@ -1964,13 +1954,6 @@ static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from) 


	btrfs_inode_unlock(inode, ilock_flags);



	/*

	 * Add back IOCB_DSYNC. Our caller, btrfs_file_write_iter(), will do

	 * the fsync (call generic_write_sync()).

	 */

	if (is_sync_write)

		iocb->ki_flags |= IOCB_DSYNC;



	/* If 'err' is -ENOTBLK then it means we must fallback to buffered IO. */

	if ((err < 0 && err != -ENOTBLK) || !iov_iter_count(from))

		goto out;

fs/btrfs/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -8152,7 +8152,8 @@ ssize_t btrfs_dio_rw(struct kiocb *iocb, struct iov_iter *iter, size_t done_befo 
	struct btrfs_dio_data data;



	return iomap_dio_rw(iocb, iter, &btrfs_dio_iomap_ops, &btrfs_dio_ops,

			    IOMAP_DIO_PARTIAL, &data, done_before);

			    IOMAP_DIO_PARTIAL | IOMAP_DIO_NOSYNC,

			    &data, done_before);

}



static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,