Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4f56903 authored by David Sterba's avatar David Sterba
Browse files

btrfs: btrfs_io_bio_alloc never fails, skip error handling 



Update direct callers of btrfs_io_bio_alloc that do error handling, that
we can now remove.

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

fs/btrfs/check-integrity.c

+0 −5
Original line number Diff line number Diff line
@@ -1639,11 +1639,6 @@ static int btrfsic_read_block(struct btrfsic_state *state, 
		unsigned int j;



		bio = btrfs_io_bio_alloc(GFP_NOFS, num_pages - i);

		if (!bio) {

			pr_info("btrfsic: bio_alloc() for %u pages failed!\n",

			       num_pages - i);

			return -1;

		}

		bio->bi_bdev = block_ctx->dev->bdev;

		bio->bi_iter.bi_sector = dev_bytenr >> 9;

		bio_set_op_attrs(bio, REQ_OP_READ, 0);

fs/btrfs/disk-io.c

+0 −3
Original line number Diff line number Diff line
@@ -3533,9 +3533,6 @@ static int write_dev_flush(struct btrfs_device *device, int wait) 
	 */

	device->flush_bio = NULL;

	bio = btrfs_io_bio_alloc(GFP_NOFS, 0);

	if (!bio)

		return -ENOMEM;



	bio->bi_end_io = btrfs_end_empty_barrier;

	bio->bi_bdev = device->bdev;

	bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH;

fs/btrfs/extent_io.c

+0 −5
Original line number Diff line number Diff line
@@ -1988,8 +1988,6 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start, 
	BUG_ON(!mirror_num);



	bio = btrfs_io_bio_alloc(GFP_NOFS, 1);

	if (!bio)

		return -EIO;

	bio->bi_iter.bi_size = 0;

	map_length = length;
@@ -2334,9 +2332,6 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio, 
	struct btrfs_io_bio *btrfs_bio;



	bio = btrfs_io_bio_alloc(GFP_NOFS, 1);

	if (!bio)

		return NULL;



	bio->bi_end_io = endio_func;

	bio->bi_iter.bi_sector = failrec->logical >> 9;

	bio->bi_bdev = fs_info->fs_devices->latest_bdev;

fs/btrfs/raid56.c

+0 −3
Original line number Diff line number Diff line
@@ -1099,9 +1099,6 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio, 


	/* put a new bio on the list */

	bio = btrfs_io_bio_alloc(GFP_NOFS, bio_max_len >> PAGE_SHIFT?:1);

	if (!bio)

		return -ENOMEM;



	bio->bi_iter.bi_size = 0;

	bio->bi_bdev = stripe->dev->bdev;

	bio->bi_iter.bi_sector = disk_start >> 9;

fs/btrfs/scrub.c

+0 −25
Original line number Diff line number Diff line
@@ -1738,11 +1738,6 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info, 


		WARN_ON(!page->page);

		bio = btrfs_io_bio_alloc(GFP_NOFS, 1);

		if (!bio) {

			page->io_error = 1;

			sblock->no_io_error_seen = 0;

			continue;

		}

		bio->bi_bdev = page->dev->bdev;



		bio_add_page(bio, page->page, PAGE_SIZE, 0);
@@ -1831,8 +1826,6 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad, 
		}



		bio = btrfs_io_bio_alloc(GFP_NOFS, 1);

		if (!bio)

			return -EIO;

		bio->bi_bdev = page_bad->dev->bdev;

		bio->bi_iter.bi_sector = page_bad->physical >> 9;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
@@ -1924,10 +1917,6 @@ static int scrub_add_page_to_wr_bio(struct scrub_ctx *sctx, 
		if (!bio) {

			bio = btrfs_io_bio_alloc(GFP_KERNEL,

					sctx->pages_per_wr_bio);

			if (!bio) {

				mutex_unlock(&sctx->wr_lock);

				return -ENOMEM;

			}

			sbio->bio = bio;

		}
@@ -2329,8 +2318,6 @@ static int scrub_add_page_to_rd_bio(struct scrub_ctx *sctx, 
		if (!bio) {

			bio = btrfs_io_bio_alloc(GFP_KERNEL,

					sctx->pages_per_rd_bio);

			if (!bio)

				return -ENOMEM;

			sbio->bio = bio;

		}
@@ -2457,9 +2444,6 @@ static void scrub_missing_raid56_pages(struct scrub_block *sblock) 
	}



	bio = btrfs_io_bio_alloc(GFP_NOFS, 0);

	if (!bio)

		goto bbio_out;



	bio->bi_iter.bi_sector = logical >> 9;

	bio->bi_private = sblock;

	bio->bi_end_io = scrub_missing_raid56_end_io;
@@ -3036,9 +3020,6 @@ static void scrub_parity_check_and_repair(struct scrub_parity *sparity) 
		goto bbio_out;



	bio = btrfs_io_bio_alloc(GFP_NOFS, 0);

	if (!bio)

		goto bbio_out;



	bio->bi_iter.bi_sector = sparity->logic_start >> 9;

	bio->bi_private = sparity;

	bio->bi_end_io = scrub_parity_bio_endio;
@@ -4646,12 +4627,6 @@ static int write_page_nocow(struct scrub_ctx *sctx, 
		return -EIO;

	}

	bio = btrfs_io_bio_alloc(GFP_NOFS, 1);

	if (!bio) {

		spin_lock(&sctx->stat_lock);

		sctx->stat.malloc_errors++;

		spin_unlock(&sctx->stat_lock);

		return -ENOMEM;

	}

	bio->bi_iter.bi_size = 0;

	bio->bi_iter.bi_sector = physical_for_dev_replace >> 9;

	bio->bi_bdev = dev->bdev;