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

Commit 4e49ea4a authored by Mike Christie's avatar Mike Christie Committed by Jens Axboe
Browse files

block/fs/drivers: remove rw argument from submit_bio 



This has callers of submit_bio/submit_bio_wait set the bio->bi_rw
instead of passing it in. This makes that use the same as
generic_make_request and how we set the other bio fields.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>

Fixed up fs/ext4/crypto.c

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent af8c34ce

block/bio.c

+3 −4
Original line number Diff line number Diff line
@@ -854,21 +854,20 @@ static void submit_bio_wait_endio(struct bio *bio) 


/**

 * submit_bio_wait - submit a bio, and wait until it completes

 * @rw: whether to %READ or %WRITE, or maybe to %READA (read ahead)

 * @bio: The &struct bio which describes the I/O

 *

 * Simple wrapper around submit_bio(). Returns 0 on success, or the error from

 * bio_endio() on failure.

 */

int submit_bio_wait(int rw, struct bio *bio)

int submit_bio_wait(struct bio *bio)

{

	struct submit_bio_ret ret;



	rw |= REQ_SYNC;

	init_completion(&ret.event);

	bio->bi_private = &ret;

	bio->bi_end_io = submit_bio_wait_endio;

	submit_bio(rw, bio);

	bio->bi_rw |= REQ_SYNC;

	submit_bio(bio);

	wait_for_completion_io(&ret.event);



	return ret.error;

block/blk-core.c

+4 −7
Original line number Diff line number Diff line
@@ -2094,7 +2094,6 @@ EXPORT_SYMBOL(generic_make_request); 


/**

 * submit_bio - submit a bio to the block device layer for I/O

 * @rw: whether to %READ or %WRITE, or maybe to %READA (read ahead)

 * @bio: The &struct bio which describes the I/O

 *

 * submit_bio() is very similar in purpose to generic_make_request(), and
@@ -2102,10 +2101,8 @@ EXPORT_SYMBOL(generic_make_request); 
 * interfaces; @bio must be presetup and ready for I/O.

 *

 */

blk_qc_t submit_bio(int rw, struct bio *bio)

blk_qc_t submit_bio(struct bio *bio)

{

	bio->bi_rw |= rw;



	/*

	 * If it's a regular read/write or a barrier with data attached,

	 * go through the normal accounting stuff before submission.
@@ -2113,12 +2110,12 @@ blk_qc_t submit_bio(int rw, struct bio *bio) 
	if (bio_has_data(bio)) {

		unsigned int count;



		if (unlikely(rw & REQ_WRITE_SAME))

		if (unlikely(bio->bi_rw & REQ_WRITE_SAME))

			count = bdev_logical_block_size(bio->bi_bdev) >> 9;

		else

			count = bio_sectors(bio);



		if (rw & WRITE) {

		if (bio->bi_rw & WRITE) {

			count_vm_events(PGPGOUT, count);

		} else {

			task_io_account_read(bio->bi_iter.bi_size);
@@ -2129,7 +2126,7 @@ blk_qc_t submit_bio(int rw, struct bio *bio) 
			char b[BDEVNAME_SIZE];

			printk(KERN_DEBUG "%s(%d): %s block %Lu on %s (%u sectors)\n",

			current->comm, task_pid_nr(current),

				(rw & WRITE) ? "WRITE" : "READ",

				(bio->bi_rw & WRITE) ? "WRITE" : "READ",

				(unsigned long long)bio->bi_iter.bi_sector,

				bdevname(bio->bi_bdev, b),

				count);

block/blk-flush.c

+2 −1
Original line number Diff line number Diff line
@@ -485,8 +485,9 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, 


	bio = bio_alloc(gfp_mask, 0);

	bio->bi_bdev = bdev;

	bio->bi_rw = WRITE_FLUSH;



	ret = submit_bio_wait(WRITE_FLUSH, bio);

	ret = submit_bio_wait(bio);



	/*

	 * The driver must store the error location in ->bi_sector, if

block/blk-lib.c

+11 −9
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ 


#include "blk.h"



static struct bio *next_bio(struct bio *bio, int rw, unsigned int nr_pages,

static struct bio *next_bio(struct bio *bio, unsigned int nr_pages,

		gfp_t gfp)

{

	struct bio *new = bio_alloc(gfp, nr_pages);



	if (bio) {

		bio_chain(bio, new);

		submit_bio(rw, bio);

		submit_bio(bio);

	}



	return new;
@@ -62,9 +62,10 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
			req_sects = end_sect - sector;

		}



		bio = next_bio(bio, type, 1, gfp_mask);

		bio = next_bio(bio, 1, gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio->bi_bdev = bdev;

		bio->bi_rw = type;



		bio->bi_iter.bi_size = req_sects << 9;

		nr_sects -= req_sects;
@@ -110,7 +111,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
	ret = __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, type,

			&bio);

	if (!ret && bio) {

		ret = submit_bio_wait(type, bio);

		ret = submit_bio_wait(bio);

		if (ret == -EOPNOTSUPP)

			ret = 0;

	}
@@ -147,13 +148,14 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector, 
	max_write_same_sectors = UINT_MAX >> 9;



	while (nr_sects) {

		bio = next_bio(bio, REQ_WRITE | REQ_WRITE_SAME, 1, gfp_mask);

		bio = next_bio(bio, 1, gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio->bi_bdev = bdev;

		bio->bi_vcnt = 1;

		bio->bi_io_vec->bv_page = page;

		bio->bi_io_vec->bv_offset = 0;

		bio->bi_io_vec->bv_len = bdev_logical_block_size(bdev);

		bio->bi_rw = REQ_WRITE | REQ_WRITE_SAME;



		if (nr_sects > max_write_same_sectors) {

			bio->bi_iter.bi_size = max_write_same_sectors << 9;
@@ -166,7 +168,7 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector, 
	}



	if (bio)

		ret = submit_bio_wait(REQ_WRITE | REQ_WRITE_SAME, bio);

		ret = submit_bio_wait(bio);

	return ret != -EOPNOTSUPP ? ret : 0;

}

EXPORT_SYMBOL(blkdev_issue_write_same);
@@ -190,11 +192,11 @@ static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, 
	unsigned int sz;



	while (nr_sects != 0) {

		bio = next_bio(bio, WRITE,

				min(nr_sects, (sector_t)BIO_MAX_PAGES),

		bio = next_bio(bio, min(nr_sects, (sector_t)BIO_MAX_PAGES),

				gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio->bi_bdev   = bdev;

		bio->bi_rw = REQ_WRITE;



		while (nr_sects != 0) {

			sz = min((sector_t) PAGE_SIZE >> 9 , nr_sects);
@@ -207,7 +209,7 @@ static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, 
	}



	if (bio)

		return submit_bio_wait(WRITE, bio);

		return submit_bio_wait(bio);

	return 0;

}

drivers/block/drbd/drbd_actlog.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int _drbd_md_sync_page_io(struct drbd_device *device, 
	if (drbd_insert_fault(device, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD))

		bio_io_error(bio);

	else

		submit_bio(rw, bio);

		submit_bio(bio);

	wait_until_done_or_force_detached(device, bdev, &device->md_io.done);

	if (!bio->bi_error)

		err = device->md_io.error;