Commit 51cf580c authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: check-integrity: remove btrfsic_check_bio() function 



The function btrfsic_check_bio() is part of the deprecated
check-integrity functionality.

Now let's remove the main entry point of check-integrity, and thankfully
most of the check-integrity code is self-contained inside
check-integrity.c, we can safely remove the function without huge
changes to btrfs code base.

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 150cce2d

fs/btrfs/bio.c

+0 −4
Original line number Diff line number Diff line
@@ -463,8 +463,6 @@ static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio) 
		(unsigned long)dev->bdev->bd_dev, btrfs_dev_name(dev),

		dev->devid, bio->bi_iter.bi_size);



	btrfsic_check_bio(bio);



	if (bio->bi_opf & REQ_BTRFS_CGROUP_PUNT)

		blkcg_punt_bio_submit(bio);

	else
@@ -779,8 +777,6 @@ int btrfs_repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start, 
	bio_init(&bio, smap.dev->bdev, &bvec, 1, REQ_OP_WRITE | REQ_SYNC);

	bio.bi_iter.bi_sector = smap.physical >> SECTOR_SHIFT;

	__bio_add_page(&bio, page, length, pg_offset);



	btrfsic_check_bio(&bio);

	ret = submit_bio_wait(&bio);

	if (ret) {

		/* try to remap that extent elsewhere? */

fs/btrfs/check-integrity.c

+0 −894

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/check-integrity.h

+0 −6
Original line number Diff line number Diff line
@@ -6,12 +6,6 @@ 
#ifndef BTRFS_CHECK_INTEGRITY_H

#define BTRFS_CHECK_INTEGRITY_H



#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY

void btrfsic_check_bio(struct bio *bio);

#else

static inline void btrfsic_check_bio(struct bio *bio) { }

#endif



int btrfsic_mount(struct btrfs_fs_info *fs_info,

		  struct btrfs_fs_devices *fs_devices,

		  int including_extent_data, u32 print_mask);

fs/btrfs/disk-io.c

+0 −4
Original line number Diff line number Diff line
@@ -3822,8 +3822,6 @@ static int write_dev_supers(struct btrfs_device *device, 
		 */

		if (i == 0 && !btrfs_test_opt(device->fs_info, NOBARRIER))

			bio->bi_opf |= REQ_FUA;



		btrfsic_check_bio(bio);

		submit_bio(bio);



		if (btrfs_advance_sb_log(device, i))
@@ -3939,8 +3937,6 @@ static void write_dev_flush(struct btrfs_device *device) 
	bio->bi_end_io = btrfs_end_empty_barrier;

	init_completion(&device->flush_wait);

	bio->bi_private = &device->flush_wait;



	btrfsic_check_bio(bio);

	submit_bio(bio);

	set_bit(BTRFS_DEV_STATE_FLUSH_SENT, &device->dev_state);

}