Commit c1e09520 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make btrfs_add_ordered_extent_dio take btrfs_inode 



Simply forwards its argument so let's get rid of one extra BTRFS_I by
taking btrfs_inode directly.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 98456b9c

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -6890,7 +6890,7 @@ static struct extent_map *btrfs_create_dio_extent(struct inode *inode, 
		if (IS_ERR(em))

			goto out;

	}

	ret = btrfs_add_ordered_extent_dio(inode, start, block_start,

	ret = btrfs_add_ordered_extent_dio(BTRFS_I(inode), start, block_start,

					   len, block_len, type);

	if (ret) {

		if (em) {

fs/btrfs/ordered-data.c

+2 −2
Original line number Diff line number Diff line
@@ -260,11 +260,11 @@ int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset, 
					  BTRFS_COMPRESS_NONE);

}



int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,

int btrfs_add_ordered_extent_dio(struct btrfs_inode *inode, u64 file_offset,

				 u64 disk_bytenr, u64 num_bytes,

				 u64 disk_num_bytes, int type)

{

	return __btrfs_add_ordered_extent(BTRFS_I(inode), file_offset, disk_bytenr,

	return __btrfs_add_ordered_extent(inode, file_offset, disk_bytenr,

					  num_bytes, disk_num_bytes, type, 1,

					  BTRFS_COMPRESS_NONE);

}

fs/btrfs/ordered-data.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ int btrfs_dec_test_first_ordered_pending(struct btrfs_inode *inode, 
int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset,

			     u64 disk_bytenr, u64 num_bytes, u64 disk_num_bytes,

			     int type);

int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,

int btrfs_add_ordered_extent_dio(struct btrfs_inode *inode, u64 file_offset,

				 u64 disk_bytenr, u64 num_bytes,

				 u64 disk_num_bytes, int type);

int btrfs_add_ordered_extent_compress(struct btrfs_inode *inode, u64 file_offset,