Commit b41b6f69 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: use btrfs_finish_ordered_extent to complete direct writes 



Use the btrfs_finish_ordered_extent helper to complete compressed writes
using the bbio->ordered pointer instead of requiring an rbtree lookup
in the otherwise equivalent btrfs_mark_ordered_io_finished called from
btrfs_writepage_endio_finish_ordered.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7dd43954

fs/btrfs/inode.c

+8 −6
Original line number Diff line number Diff line
@@ -7775,7 +7775,7 @@ static int btrfs_dio_iomap_end(struct inode *inode, loff_t pos, loff_t length, 
		pos += submitted;

		length -= submitted;

		if (write)

			btrfs_mark_ordered_io_finished(BTRFS_I(inode), NULL,

			btrfs_finish_ordered_extent(dio_data->ordered, NULL,

						    pos, length, false);

		else

			unlock_extent(&BTRFS_I(inode)->io_tree, pos,
@@ -7806,12 +7806,14 @@ static void btrfs_dio_end_io(struct btrfs_bio *bbio) 
			   dip->file_offset, dip->bytes, bio->bi_status);

	}



	if (btrfs_op(bio) == BTRFS_MAP_WRITE)

		btrfs_mark_ordered_io_finished(inode, NULL, dip->file_offset,

					       dip->bytes, !bio->bi_status);

	else

	if (btrfs_op(bio) == BTRFS_MAP_WRITE) {

		btrfs_finish_ordered_extent(bbio->ordered, NULL,

					    dip->file_offset, dip->bytes,

					    !bio->bi_status);

	} else {

		unlock_extent(&inode->io_tree, dip->file_offset,

			      dip->file_offset + dip->bytes - 1, NULL);

	}



	bbio->bio.bi_private = bbio->private;

	iomap_dio_bio_end_io(bio);