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

Commit 796a5cf0 authored by Mike Christie's avatar Mike Christie Committed by Jens Axboe
Browse files

md: use bio op accessors 



Separate the op from the rq_flag_bits and have md
set/get the bio using bio_set_op_attrs/bio_op.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent bb3cc85e

drivers/md/bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int read_sb_page(struct mddev *mddev, loff_t offset, 


		if (sync_page_io(rdev, target,

				 roundup(size, bdev_logical_block_size(rdev->bdev)),

				 page, READ, true)) {

				 page, REQ_OP_READ, 0, true)) {

			page->index = index;

			return 0;

		}

drivers/md/dm-raid.c

+3 −2
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ static int read_disk_sb(struct md_rdev *rdev, int size) 
	if (rdev->sb_loaded)

		return 0;



	if (!sync_page_io(rdev, 0, size, rdev->sb_page, READ, 1)) {

	if (!sync_page_io(rdev, 0, size, rdev->sb_page, REQ_OP_READ, 0, 1)) {

		DMERR("Failed to read superblock of device at position %d",

		      rdev->raid_disk);

		md_error(rdev->mddev, rdev);
@@ -1651,7 +1651,8 @@ static void attempt_restore_of_faulty_devices(struct raid_set *rs) 
	for (i = 0; i < rs->md.raid_disks; i++) {

		r = &rs->dev[i].rdev;

		if (test_bit(Faulty, &r->flags) && r->sb_page &&

		    sync_page_io(r, 0, r->sb_size, r->sb_page, READ, 1)) {

		    sync_page_io(r, 0, r->sb_size, r->sb_page, REQ_OP_READ, 0,

				 1)) {

			DMINFO("Faulty %s device #%d has readable super block."

			       "  Attempting to revive it.",

			       rs->raid_type->name, i);

drivers/md/linear.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio) 
		split->bi_iter.bi_sector = split->bi_iter.bi_sector -

			start_sector + data_offset;



		if (unlikely((split->bi_rw & REQ_DISCARD) &&

		if (unlikely((bio_op(split) == REQ_OP_DISCARD) &&

			 !blk_queue_discard(bdev_get_queue(split->bi_bdev)))) {

			/* Just ignore it */

			bio_endio(split);

drivers/md/md.c

+6 −6
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static void submit_flushes(struct work_struct *ws) 
			bi->bi_end_io = md_end_flush;

			bi->bi_private = rdev;

			bi->bi_bdev = rdev->bdev;

			bi->bi_rw = WRITE_FLUSH;

			bio_set_op_attrs(bi, REQ_OP_WRITE, WRITE_FLUSH);

			atomic_inc(&mddev->flush_pending);

			submit_bio(bi);

			rcu_read_lock();
@@ -743,7 +743,7 @@ void md_super_write(struct mddev *mddev, struct md_rdev *rdev, 
	bio_add_page(bio, page, size, 0);

	bio->bi_private = rdev;

	bio->bi_end_io = super_written;

	bio->bi_rw = WRITE_FLUSH_FUA;

	bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_FLUSH_FUA);



	atomic_inc(&mddev->pending_writes);

	submit_bio(bio);
@@ -756,14 +756,14 @@ void md_super_wait(struct mddev *mddev) 
}



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

		 struct page *page, int rw, bool metadata_op)

		 struct page *page, int op, int op_flags, bool metadata_op)

{

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

	int ret;



	bio->bi_bdev = (metadata_op && rdev->meta_bdev) ?

		rdev->meta_bdev : rdev->bdev;

	bio->bi_rw = rw;

	bio_set_op_attrs(bio, op, op_flags);

	if (metadata_op)

		bio->bi_iter.bi_sector = sector + rdev->sb_start;

	else if (rdev->mddev->reshape_position != MaxSector &&
@@ -789,7 +789,7 @@ static int read_disk_sb(struct md_rdev *rdev, int size) 
	if (rdev->sb_loaded)

		return 0;



	if (!sync_page_io(rdev, 0, size, rdev->sb_page, READ, true))

	if (!sync_page_io(rdev, 0, size, rdev->sb_page, REQ_OP_READ, 0, true))

		goto fail;

	rdev->sb_loaded = 1;

	return 0;
@@ -1475,7 +1475,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ 
			return -EINVAL;

		bb_sector = (long long)offset;

		if (!sync_page_io(rdev, bb_sector, sectors << 9,

				  rdev->bb_page, READ, true))

				  rdev->bb_page, REQ_OP_READ, 0, true))

			return -EIO;

		bbp = (u64 *)page_address(rdev->bb_page);

		rdev->badblocks.shift = sb->bblog_shift;

drivers/md/md.h

+2 −1
Original line number Diff line number Diff line
@@ -618,7 +618,8 @@ extern void md_super_write(struct mddev *mddev, struct md_rdev *rdev, 
			   sector_t sector, int size, struct page *page);

extern void md_super_wait(struct mddev *mddev);

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

			struct page *page, int rw, bool metadata_op);

			struct page *page, int op, int op_flags,

			bool metadata_op);

extern void md_do_sync(struct md_thread *thread);

extern void md_new_event(struct mddev *mddev);

extern int md_allow_write(struct mddev *mddev);