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

Commit 95fe6c1a authored by Mike Christie's avatar Mike Christie Committed by Jens Axboe
Browse files

block, fs, mm, drivers: use bio set/get op accessors 



This patch converts the simple bi_rw use cases in the block,
drivers, mm and fs code to set/get the bio operation using
bio_set_op_attrs/bio_op

These should be simple one or two liner cases, so I just did them
in one patch. The next patches handle the more complicated
cases in a module per patch.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent c8d93247

block/bio.c

+6 −7
Original line number Diff line number Diff line
@@ -656,16 +656,15 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask, 
	bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src), bs);

	if (!bio)

		return NULL;



	bio->bi_bdev		= bio_src->bi_bdev;

	bio->bi_rw		= bio_src->bi_rw;

	bio->bi_iter.bi_sector	= bio_src->bi_iter.bi_sector;

	bio->bi_iter.bi_size	= bio_src->bi_iter.bi_size;



	if (bio->bi_rw & REQ_DISCARD)

	if (bio_op(bio) == REQ_OP_DISCARD)

		goto integrity_clone;



	if (bio->bi_rw & REQ_WRITE_SAME) {

	if (bio_op(bio) == REQ_OP_WRITE_SAME) {

		bio->bi_io_vec[bio->bi_vcnt++] = bio_src->bi_io_vec[0];

		goto integrity_clone;

	}
@@ -1166,7 +1165,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, 
		goto out_bmd;



	if (iter->type & WRITE)

		bio->bi_rw |= REQ_WRITE;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);



	ret = 0;
@@ -1336,7 +1335,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, 
	 * set data direction, and check if mapped pages need bouncing

	 */

	if (iter->type & WRITE)

		bio->bi_rw |= REQ_WRITE;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);



	bio_set_flag(bio, BIO_USER_MAPPED);
@@ -1529,7 +1528,7 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, 
		bio->bi_private = data;

	} else {

		bio->bi_end_io = bio_copy_kern_endio;

		bio->bi_rw |= REQ_WRITE;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

	}



	return bio;
@@ -1784,7 +1783,7 @@ struct bio *bio_split(struct bio *bio, int sectors, 
	 * Discards need a mutable bio_vec to accommodate the payload

	 * required by the DSM TRIM and UNMAP commands.

	 */

	if (bio->bi_rw & REQ_DISCARD)

	if (bio_op(bio) == REQ_OP_DISCARD)

		split = bio_clone_bioset(bio, gfp, bs);

	else

		split = bio_clone_fast(bio, gfp, bs);

block/blk-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1973,14 +1973,14 @@ generic_make_request_checks(struct bio *bio) 
		}

	}



	if ((bio->bi_rw & REQ_DISCARD) &&

	if ((bio_op(bio) == REQ_OP_DISCARD) &&

	    (!blk_queue_discard(q) ||

	     ((bio->bi_rw & REQ_SECURE) && !blk_queue_secdiscard(q)))) {

		err = -EOPNOTSUPP;

		goto end_io;

	}



	if (bio->bi_rw & REQ_WRITE_SAME && !bdev_write_same(bio->bi_bdev)) {

	if (bio_op(bio) == REQ_OP_WRITE_SAME && !bdev_write_same(bio->bi_bdev)) {

		err = -EOPNOTSUPP;

		goto end_io;

	}
@@ -2110,7 +2110,7 @@ blk_qc_t submit_bio(struct bio *bio) 
	if (bio_has_data(bio)) {

		unsigned int count;



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

		if (unlikely(bio_op(bio) == REQ_OP_WRITE_SAME))

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

		else

			count = bio_sectors(bio);

block/blk-flush.c

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ 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;

	bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_FLUSH);



	ret = submit_bio_wait(bio);

block/blk-lib.c

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector, 
		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;

		bio_set_op_attrs(bio, REQ_OP_WRITE_SAME, 0);



		if (nr_sects > max_write_same_sectors) {

			bio->bi_iter.bi_size = max_write_same_sectors << 9;
@@ -196,7 +196,7 @@ static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, 
				gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio->bi_bdev   = bdev;

		bio->bi_rw = REQ_WRITE;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);



		while (nr_sects != 0) {

			sz = min((sector_t) PAGE_SIZE >> 9 , nr_sects);

block/blk-map.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, 
		return PTR_ERR(bio);



	if (!reading)

		bio->bi_rw |= REQ_WRITE;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);



	if (do_copy)

		rq->cmd_flags |= REQ_COPY_USER;