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

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

bcache: use bio op accessors 



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

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 e6047149

drivers/md/bcache/btree.c

+2 −2
Original line number Diff line number Diff line
@@ -294,10 +294,10 @@ static void bch_btree_node_read(struct btree *b) 
	closure_init_stack(&cl);



	bio = bch_bbio_alloc(b->c);

	bio->bi_rw	= REQ_META|READ_SYNC;

	bio->bi_iter.bi_size = KEY_SIZE(&b->key) << 9;

	bio->bi_end_io	= btree_node_read_endio;

	bio->bi_private	= &cl;

	bio_set_op_attrs(bio, REQ_OP_READ, REQ_META|READ_SYNC);



	bch_bio_map(bio, b->keys.set[0].data);
@@ -396,8 +396,8 @@ static void do_btree_node_write(struct btree *b) 


	b->bio->bi_end_io	= btree_node_write_endio;

	b->bio->bi_private	= cl;

	b->bio->bi_rw		= REQ_META|WRITE_SYNC|REQ_FUA;

	b->bio->bi_iter.bi_size	= roundup(set_bytes(i), block_bytes(b->c));

	bio_set_op_attrs(b->bio, REQ_OP_WRITE, REQ_META|WRITE_SYNC|REQ_FUA);

	bch_bio_map(b->bio, i);



	/*

drivers/md/bcache/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void bch_btree_verify(struct btree *b) 
	bio->bi_bdev		= PTR_CACHE(b->c, &b->key, 0)->bdev;

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

	bio->bi_iter.bi_size	= KEY_SIZE(&v->key) << 9;

	bio->bi_rw		= REQ_META|READ_SYNC;

	bio_set_op_attrs(bio, REQ_OP_READ, REQ_META|READ_SYNC);

	bch_bio_map(bio, sorted);



	submit_bio_wait(bio);
@@ -114,7 +114,7 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) 
	check = bio_clone(bio, GFP_NOIO);

	if (!check)

		return;

	check->bi_rw |= READ_SYNC;

	bio_set_op_attrs(check, REQ_OP_READ, READ_SYNC);



	if (bio_alloc_pages(check, GFP_NOIO))

		goto out_put;

drivers/md/bcache/journal.c

+4 −3
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ reread: left = ca->sb.bucket_size - offset; 
		bio_reset(bio);

		bio->bi_iter.bi_sector	= bucket + offset;

		bio->bi_bdev	= ca->bdev;

		bio->bi_rw	= READ;

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



		bio->bi_end_io	= journal_read_endio;

		bio->bi_private = &cl;

		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bch_bio_map(bio, data);



		closure_bio_submit(bio, &cl);
@@ -449,10 +449,10 @@ static void do_journal_discard(struct cache *ca) 
		atomic_set(&ja->discard_in_flight, DISCARD_IN_FLIGHT);



		bio_init(bio);

		bio_set_op_attrs(bio, REQ_OP_DISCARD, 0);

		bio->bi_iter.bi_sector	= bucket_to_sector(ca->set,

						ca->sb.d[ja->discard_idx]);

		bio->bi_bdev		= ca->bdev;

		bio->bi_rw		= REQ_WRITE|REQ_DISCARD;

		bio->bi_max_vecs	= 1;

		bio->bi_io_vec		= bio->bi_inline_vecs;

		bio->bi_iter.bi_size	= bucket_bytes(ca);
@@ -626,11 +626,12 @@ static void journal_write_unlocked(struct closure *cl) 
		bio_reset(bio);

		bio->bi_iter.bi_sector	= PTR_OFFSET(k, i);

		bio->bi_bdev	= ca->bdev;

		bio->bi_rw	= REQ_WRITE|REQ_SYNC|REQ_META|REQ_FLUSH|REQ_FUA;

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



		bio->bi_end_io	= journal_write_endio;

		bio->bi_private = w;

		bio_set_op_attrs(bio, REQ_OP_WRITE,

				 REQ_SYNC|REQ_META|REQ_FLUSH|REQ_FUA);

		bch_bio_map(bio, w->data);



		trace_bcache_journal_write(bio);

drivers/md/bcache/movinggc.c

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

		bio = &io->bio.bio;



		bio->bi_rw	= READ;

		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bio->bi_end_io	= read_moving_endio;



		if (bio_alloc_pages(bio, GFP_KERNEL))

drivers/md/bcache/request.c

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

		bch_keylist_push(&op->insert_keys);



		n->bi_rw |= REQ_WRITE;

		bio_set_op_attrs(n, REQ_OP_WRITE, 0);

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

	} while (n != bio);
@@ -378,7 +378,7 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio) 


	if (test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags) ||

	    c->gc_stats.in_use > CUTOFF_CACHE_ADD ||

	    (bio->bi_rw & REQ_DISCARD))

	    (bio_op(bio) == REQ_OP_DISCARD))

		goto skip;



	if (mode == CACHE_MODE_NONE ||
@@ -899,7 +899,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s) 
	 * But check_overlapping drops dirty keys for which io hasn't started,

	 * so we still want to call it.

	 */

	if (bio->bi_rw & REQ_DISCARD)

	if (bio_op(bio) == REQ_OP_DISCARD)

		s->iop.bypass = true;



	if (should_writeback(dc, s->orig_bio,
@@ -913,7 +913,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s) 
		s->iop.bio = s->orig_bio;

		bio_get(s->iop.bio);



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

		if ((bio_op(bio) != REQ_OP_DISCARD) ||

		    blk_queue_discard(bdev_get_queue(dc->bdev)))

			closure_bio_submit(bio, cl);

	} else if (s->iop.writeback) {
@@ -925,10 +925,10 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s) 
			struct bio *flush = bio_alloc_bioset(GFP_NOIO, 0,

							     dc->disk.bio_split);



			flush->bi_rw	= WRITE_FLUSH;

			flush->bi_bdev	= bio->bi_bdev;

			flush->bi_end_io = request_endio;

			flush->bi_private = cl;

			bio_set_op_attrs(flush, REQ_OP_WRITE, WRITE_FLUSH);



			closure_bio_submit(flush, cl);

		}
@@ -992,7 +992,7 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q, 
				cached_dev_read(dc, s);

		}

	} else {

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

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

		    !blk_queue_discard(bdev_get_queue(dc->bdev)))

			bio_endio(bio);

		else
@@ -1103,7 +1103,7 @@ static blk_qc_t flash_dev_make_request(struct request_queue *q, 
					&KEY(d->id, bio->bi_iter.bi_sector, 0),

					&KEY(d->id, bio_end_sector(bio), 0));



		s->iop.bypass		= (bio->bi_rw & REQ_DISCARD) != 0;

		s->iop.bypass		= (bio_op(bio) == REQ_OP_DISCARD) != 0;

		s->iop.writeback	= true;

		s->iop.bio		= bio;