Commit 7920b773 authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop parameter compression_type from btrfs_submit_dio_repair_bio 



Compression and direct io don't work together so the compression
parameter can be dropped after previous patch that changed the call
to direct.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 19af6a7d

fs/btrfs/btrfs_inode.h

+1 −3
Original line number Diff line number Diff line
@@ -414,9 +414,7 @@ static inline void btrfs_inode_split_flags(u64 inode_item_flags, 
void btrfs_submit_data_write_bio(struct inode *inode, struct bio *bio, int mirror_num);

void btrfs_submit_data_read_bio(struct inode *inode, struct bio *bio,

			int mirror_num, enum btrfs_compression_type compress_type);

void btrfs_submit_dio_repair_bio(struct inode *inode, struct bio *bio,

				 int mirror_num,

				 enum btrfs_compression_type compress_type);

void btrfs_submit_dio_repair_bio(struct inode *inode, struct bio *bio, int mirror_num);

int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,

			    u32 pgoff, u8 *csum, const u8 * const csum_expected);

int btrfs_check_data_csum(struct inode *inode, struct btrfs_bio *bbio,

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ int btrfs_repair_one_sector(struct inode *inode, struct btrfs_bio *failed_bbio, 
	if (submit_buffered)

		btrfs_submit_data_read_bio(inode, repair_bio, failrec->this_mirror, 0);

	else

		btrfs_submit_dio_repair_bio(inode, repair_bio, failrec->this_mirror, 0);

		btrfs_submit_dio_repair_bio(inode, repair_bio, failrec->this_mirror);



	return BLK_STS_OK;

}

fs/btrfs/inode.c

+1 −3
Original line number Diff line number Diff line
@@ -7923,9 +7923,7 @@ static void btrfs_dio_private_put(struct btrfs_dio_private *dip) 
	bio_endio(&dip->bio);

}



void btrfs_submit_dio_repair_bio(struct inode *inode, struct bio *bio,

				 int mirror_num,

				 enum btrfs_compression_type compress_type)

void btrfs_submit_dio_repair_bio(struct inode *inode, struct bio *bio, int mirror_num)

{

	struct btrfs_dio_private *dip = btrfs_bio(bio)->private;

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);