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

Commit c170bbb4 authored by Kent Overstreet's avatar Kent Overstreet Committed by Jens Axboe
Browse files

block: submit_bio_wait() conversions 



It was being open coded in a few places.

Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Joern Engel <joern@logfs.org>
Cc: Prasad Joshi <prasadjoshi.linux@gmail.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Chris Mason <chris.mason@fusionio.com>
Acked-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2c575026

block/blk-flush.c

+1 −18
Original line number Diff line number Diff line
@@ -502,15 +502,6 @@ void blk_abort_flushes(struct request_queue *q) 
	}

}



static void bio_end_flush(struct bio *bio, int err)

{

	if (err)

		clear_bit(BIO_UPTODATE, &bio->bi_flags);

	if (bio->bi_private)

		complete(bio->bi_private);

	bio_put(bio);

}



/**

 * blkdev_issue_flush - queue a flush

 * @bdev:	blockdev to issue flush for
@@ -526,7 +517,6 @@ static void bio_end_flush(struct bio *bio, int err) 
int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,

		sector_t *error_sector)

{

	DECLARE_COMPLETION_ONSTACK(wait);

	struct request_queue *q;

	struct bio *bio;

	int ret = 0;
@@ -548,13 +538,9 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, 
		return -ENXIO;



	bio = bio_alloc(gfp_mask, 0);

	bio->bi_end_io = bio_end_flush;

	bio->bi_bdev = bdev;

	bio->bi_private = &wait;



	bio_get(bio);

	submit_bio(WRITE_FLUSH, bio);

	wait_for_completion_io(&wait);

	ret = submit_bio_wait(WRITE_FLUSH, bio);



	/*

	 * The driver must store the error location in ->bi_sector, if
@@ -564,9 +550,6 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, 
	if (error_sector)

		*error_sector = bio->bi_sector;



	if (!bio_flagged(bio, BIO_UPTODATE))

		ret = -EIO;



	bio_put(bio);

	return ret;

}

drivers/md/md.c

+1 −11
Original line number Diff line number Diff line
@@ -776,16 +776,10 @@ void md_super_wait(struct mddev *mddev) 
	finish_wait(&mddev->sb_wait, &wq);

}



static void bi_complete(struct bio *bio, int error)

{

	complete((struct completion*)bio->bi_private);

}



int sync_page_io(struct md_rdev *rdev, sector_t sector, int size,

		 struct page *page, int rw, bool metadata_op)

{

	struct bio *bio = bio_alloc_mddev(GFP_NOIO, 1, rdev->mddev);

	struct completion event;

	int ret;



	rw |= REQ_SYNC;
@@ -801,11 +795,7 @@ int sync_page_io(struct md_rdev *rdev, sector_t sector, int size, 
	else

		bio->bi_sector = sector + rdev->data_offset;

	bio_add_page(bio, page, size, 0);

	init_completion(&event);

	bio->bi_private = &event;

	bio->bi_end_io = bi_complete;

	submit_bio(rw, bio);

	wait_for_completion(&event);

	submit_bio_wait(rw, bio);



	ret = test_bit(BIO_UPTODATE, &bio->bi_flags);

	bio_put(bio);

fs/btrfs/check-integrity.c

+13 −19
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ static void btrfsic_release_block_ctx(struct btrfsic_block_data_ctx *block_ctx); 
static int btrfsic_read_block(struct btrfsic_state *state,

			      struct btrfsic_block_data_ctx *block_ctx);

static void btrfsic_dump_database(struct btrfsic_state *state);

static void btrfsic_complete_bio_end_io(struct bio *bio, int err);

static int btrfsic_test_for_metadata(struct btrfsic_state *state,

				     char **datav, unsigned int num_pages);

static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
@@ -1677,7 +1676,6 @@ static int btrfsic_read_block(struct btrfsic_state *state, 
	for (i = 0; i < num_pages;) {

		struct bio *bio;

		unsigned int j;

		DECLARE_COMPLETION_ONSTACK(complete);



		bio = btrfs_io_bio_alloc(GFP_NOFS, num_pages - i);

		if (!bio) {
@@ -1688,8 +1686,6 @@ static int btrfsic_read_block(struct btrfsic_state *state, 
		}

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

		bio->bi_sector = dev_bytenr >> 9;

		bio->bi_end_io = btrfsic_complete_bio_end_io;

		bio->bi_private = &complete;



		for (j = i; j < num_pages; j++) {

			ret = bio_add_page(bio, block_ctx->pagev[j],
@@ -1702,12 +1698,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, 
			       "btrfsic: error, failed to add a single page!\n");

			return -1;

		}

		submit_bio(READ, bio);



		/* this will also unplug the queue */

		wait_for_completion(&complete);



		if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) {

		if (submit_bio_wait(READ, bio)) {

			printk(KERN_INFO

			       "btrfsic: read error at logical %llu dev %s!\n",

			       block_ctx->start, block_ctx->dev->name);
@@ -1730,11 +1721,6 @@ static int btrfsic_read_block(struct btrfsic_state *state, 
	return block_ctx->len;

}



static void btrfsic_complete_bio_end_io(struct bio *bio, int err)

{

	complete((struct completion *)bio->bi_private);

}



static void btrfsic_dump_database(struct btrfsic_state *state)

{

	struct list_head *elem_all;
@@ -2998,14 +2984,12 @@ int btrfsic_submit_bh(int rw, struct buffer_head *bh) 
	return submit_bh(rw, bh);

}



void btrfsic_submit_bio(int rw, struct bio *bio)

static void __btrfsic_submit_bio(int rw, struct bio *bio)

{

	struct btrfsic_dev_state *dev_state;



	if (!btrfsic_is_initialized) {

		submit_bio(rw, bio);

	if (!btrfsic_is_initialized)

		return;

	}



	mutex_lock(&btrfsic_mutex);

	/* since btrfsic_submit_bio() is also called before
@@ -3097,10 +3081,20 @@ void btrfsic_submit_bio(int rw, struct bio *bio) 
	}

leave:

	mutex_unlock(&btrfsic_mutex);

}



void btrfsic_submit_bio(int rw, struct bio *bio)

{

	__btrfsic_submit_bio(rw, bio);

	submit_bio(rw, bio);

}



int btrfsic_submit_bio_wait(int rw, struct bio *bio)

{

	__btrfsic_submit_bio(rw, bio);

	return submit_bio_wait(rw, bio);

}



int btrfsic_mount(struct btrfs_root *root,

		  struct btrfs_fs_devices *fs_devices,

		  int including_extent_data, u32 print_mask)

fs/btrfs/check-integrity.h

+2 −0
Original line number Diff line number Diff line
@@ -22,9 +22,11 @@ 
#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY

int btrfsic_submit_bh(int rw, struct buffer_head *bh);

void btrfsic_submit_bio(int rw, struct bio *bio);

int btrfsic_submit_bio_wait(int rw, struct bio *bio);

#else

#define btrfsic_submit_bh submit_bh

#define btrfsic_submit_bio submit_bio

#define btrfsic_submit_bio_wait submit_bio_wait

#endif



int btrfsic_mount(struct btrfs_root *root,

fs/btrfs/extent_io.c

+1 −11
Original line number Diff line number Diff line
@@ -1952,11 +1952,6 @@ static int free_io_failure(struct inode *inode, struct io_failure_record *rec, 
	return err;

}



static void repair_io_failure_callback(struct bio *bio, int err)

{

	complete(bio->bi_private);

}



/*

 * this bypasses the standard btrfs submit functions deliberately, as

 * the standard behavior is to write all copies in a raid setup. here we only
@@ -1973,7 +1968,6 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start, 
{

	struct bio *bio;

	struct btrfs_device *dev;

	DECLARE_COMPLETION_ONSTACK(compl);

	u64 map_length = 0;

	u64 sector;

	struct btrfs_bio *bbio = NULL;
@@ -1989,8 +1983,6 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start, 
	bio = btrfs_io_bio_alloc(GFP_NOFS, 1);

	if (!bio)

		return -EIO;

	bio->bi_private = &compl;

	bio->bi_end_io = repair_io_failure_callback;

	bio->bi_size = 0;

	map_length = length;
@@ -2011,10 +2003,8 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start, 
	}

	bio->bi_bdev = dev->bdev;

	bio_add_page(bio, page, length, start - page_offset(page));

	btrfsic_submit_bio(WRITE_SYNC, bio);

	wait_for_completion(&compl);



	if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) {

	if (btrfsic_submit_bio_wait(WRITE_SYNC, bio)) {

		/* try to remap that extent elsewhere? */

		bio_put(bio);

		btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_WRITE_ERRS);