Commit c34b7ac6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove bio_set_op_attrs 



This macro is obsolete, so replace the last few uses with open coded
bi_opf assignments.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarColy Li &lt;colyli@suse.de <mailto:colyli@suse.de&gt;>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20221206144057.720846-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent db1c7d77

drivers/md/bcache/movinggc.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void read_moving(struct cache_set *c) 
		moving_init(io);

		bio = &io->bio.bio;



		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bio->bi_opf = REQ_OP_READ;

		bio->bi_end_io	= read_moving_endio;



		if (bch_bio_alloc_pages(bio, GFP_KERNEL))

drivers/md/bcache/request.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void bch_data_insert_start(struct closure *cl) 
		trace_bcache_cache_insert(k);

		bch_keylist_push(&op->insert_keys);



		bio_set_op_attrs(n, REQ_OP_WRITE, 0);

		n->bi_opf = REQ_OP_WRITE;

		bch_submit_bbio(n, op->c, k, 0);

	} while (n != bio);

drivers/md/bcache/writeback.c

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void write_dirty(struct closure *cl) 
	 */

	if (KEY_DIRTY(&w->key)) {

		dirty_init(w);

		bio_set_op_attrs(&io->bio, REQ_OP_WRITE, 0);

		io->bio.bi_opf = REQ_OP_WRITE;

		io->bio.bi_iter.bi_sector = KEY_START(&w->key);

		bio_set_dev(&io->bio, io->dc->bdev);

		io->bio.bi_end_io	= dirty_endio;
@@ -547,7 +547,7 @@ static void read_dirty(struct cached_dev *dc) 
			io->sequence    = sequence++;



			dirty_init(w);

			bio_set_op_attrs(&io->bio, REQ_OP_READ, 0);

			io->bio.bi_opf = REQ_OP_READ;

			io->bio.bi_iter.bi_sector = PTR_OFFSET(&w->key, 0);

			bio_set_dev(&io->bio, dc->disk.c->cache->bdev);

			io->bio.bi_end_io	= read_dirty_endio;

drivers/md/dm-thin.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static void end_discard(struct discard_op *op, int r) 
		 * need to wait for the chain to complete.

		 */

		bio_chain(op->bio, op->parent_bio);

		bio_set_op_attrs(op->bio, REQ_OP_DISCARD, 0);

		op->bio->bi_opf = REQ_OP_DISCARD;

		submit_bio(op->bio);

	}

drivers/md/raid1.c

+6 −6
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio, 
	read_bio->bi_iter.bi_sector = r1_bio->sector +

		mirror->rdev->data_offset;

	read_bio->bi_end_io = raid1_end_read_request;

	bio_set_op_attrs(read_bio, op, do_sync);

	read_bio->bi_opf = op | do_sync;

	if (test_bit(FailFast, &mirror->rdev->flags) &&

	    test_bit(R1BIO_FailFast, &r1_bio->state))

	        read_bio->bi_opf |= MD_FAILFAST;
@@ -2254,7 +2254,7 @@ static void sync_request_write(struct mddev *mddev, struct r1bio *r1_bio) 
			continue;

		}



		bio_set_op_attrs(wbio, REQ_OP_WRITE, 0);

		wbio->bi_opf = REQ_OP_WRITE;

		if (test_bit(FailFast, &conf->mirrors[i].rdev->flags))

			wbio->bi_opf |= MD_FAILFAST;
@@ -2419,7 +2419,7 @@ static int narrow_write_error(struct r1bio *r1_bio, int i) 
					       GFP_NOIO, &mddev->bio_set);

		}



		bio_set_op_attrs(wbio, REQ_OP_WRITE, 0);

		wbio->bi_opf = REQ_OP_WRITE;

		wbio->bi_iter.bi_sector = r1_bio->sector;

		wbio->bi_iter.bi_size = r1_bio->sectors << 9;
@@ -2770,7 +2770,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr, 
			if (i < conf->raid_disks)

				still_degraded = 1;

		} else if (!test_bit(In_sync, &rdev->flags)) {

			bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

			bio->bi_opf = REQ_OP_WRITE;

			bio->bi_end_io = end_sync_write;

			write_targets ++;

		} else {
@@ -2797,7 +2797,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr, 
					if (disk < 0)

						disk = i;

				}

				bio_set_op_attrs(bio, REQ_OP_READ, 0);

				bio->bi_opf = REQ_OP_READ;

				bio->bi_end_io = end_sync_read;

				read_targets++;

			} else if (!test_bit(WriteErrorSeen, &rdev->flags) &&
@@ -2809,7 +2809,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr, 
				 * if we are doing resync or repair. Otherwise, leave

				 * this device alone for this sync request.

				 */

				bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

				bio->bi_opf = REQ_OP_WRITE;

				bio->bi_end_io = end_sync_write;

				write_targets++;

			}