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

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

block: get rid of bio_rw and READA 



These two are confusing leftover of the old world order, combining
values of the REQ_OP_ and REQ_ namespaces.  For callers that don't
special case we mostly just replace bi_rw with bio_data_dir or
op_is_write, except for the few cases where a switch over the REQ_OP_
values makes more sense.  Any check for READA is replaced with an
explicit check for REQ_RAHEAD.  Also remove the READA alias for
REQ_RAHEAD.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarMike Christie <mchristi@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3f40bf2c

drivers/block/brd.c

+1 −3
Original line number Diff line number Diff line
@@ -347,9 +347,7 @@ static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio) 
		goto out;

	}



	rw = bio_rw(bio);

	if (rw == READA)

		rw = READ;

	rw = bio_data_dir(bio);



	bio_for_each_segment(bvec, bio, iter) {

		unsigned int len = bvec.bv_len;

drivers/block/drbd/drbd_req.c

+19 −15
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m) 
{

	const unsigned s = req->rq_state;

	struct drbd_device *device = req->device;

	int rw;

	int error, ok;



	/* we must not complete the master bio, while it is
@@ -243,8 +242,6 @@ void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m) 
		return;

	}



	rw = bio_rw(req->master_bio);



	/*

	 * figure out whether to report success or failure.

	 *
@@ -268,7 +265,7 @@ void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m) 
	 * epoch number.  If they match, increase the current_tle_nr,

	 * and reset the transfer log epoch write_cnt.

	 */

	if (rw == WRITE &&

	if (op_is_write(bio_op(req->master_bio)) &&

	    req->epoch == atomic_read(&first_peer_device(device)->connection->current_tle_nr))

		start_new_tl_epoch(first_peer_device(device)->connection);
@@ -285,11 +282,14 @@ void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m) 
	 * because no path was available, in which case

	 * it was not even added to the transfer_log.

	 *

	 * READA may fail, and will not be retried.

	 * read-ahead may fail, and will not be retried.

	 *

	 * WRITE should have used all available paths already.

	 */

	if (!ok && rw == READ && !list_empty(&req->tl_requests))

	if (!ok &&

	    bio_op(req->master_bio) == REQ_OP_READ &&

	    !(req->master_bio->bi_rw & REQ_RAHEAD) &&

	    !list_empty(&req->tl_requests))

		req->rq_state |= RQ_POSTPONED;



	if (!(req->rq_state & RQ_POSTPONED)) {
@@ -645,7 +645,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, 
		__drbd_chk_io_error(device, DRBD_READ_ERROR);

		/* fall through. */

	case READ_AHEAD_COMPLETED_WITH_ERROR:

		/* it is legal to fail READA, no __drbd_chk_io_error in that case. */

		/* it is legal to fail read-ahead, no __drbd_chk_io_error in that case. */

		mod_rq_state(req, m, RQ_LOCAL_PENDING, RQ_LOCAL_COMPLETED);

		break;
@@ -657,7 +657,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, 
		break;



	case QUEUE_FOR_NET_READ:

		/* READ or READA, and

		/* READ, and

		 * no local disk,

		 * or target area marked as invalid,

		 * or just got an io-error. */
@@ -1172,7 +1172,14 @@ drbd_submit_req_private_bio(struct drbd_request *req) 
{

	struct drbd_device *device = req->device;

	struct bio *bio = req->private_bio;

	const int rw = bio_rw(bio);

	unsigned int type;



	if (bio_op(bio) != REQ_OP_READ)

		type = DRBD_FAULT_DT_WR;

	else if (bio->bi_rw & REQ_RAHEAD)

		type = DRBD_FAULT_DT_RA;

	else

		type = DRBD_FAULT_DT_RD;



	bio->bi_bdev = device->ldev->backing_bdev;
@@ -1182,10 +1189,7 @@ drbd_submit_req_private_bio(struct drbd_request *req) 
	 * stable storage, and this is a WRITE, we may not even submit

	 * this bio. */

	if (get_ldev(device)) {

		if (drbd_insert_fault(device,

				      rw == WRITE ? DRBD_FAULT_DT_WR

				    : rw == READ  ? DRBD_FAULT_DT_RD

				    :               DRBD_FAULT_DT_RA))

		if (drbd_insert_fault(device, type))

			bio_io_error(bio);

		else if (bio_op(bio) == REQ_OP_DISCARD)

			drbd_process_discard_req(req);
@@ -1278,7 +1282,7 @@ static bool may_do_writes(struct drbd_device *device) 
static void drbd_send_and_submit(struct drbd_device *device, struct drbd_request *req)

{

	struct drbd_resource *resource = device->resource;

	const int rw = bio_rw(req->master_bio);

	const int rw = bio_data_dir(req->master_bio);

	struct bio_and_error m = { NULL, };

	bool no_remote = false;

	bool submit_private_bio = false;
@@ -1308,7 +1312,7 @@ static void drbd_send_and_submit(struct drbd_device *device, struct drbd_request 
		goto out;

	}



	/* We fail READ/READA early, if we can not serve it.

	/* We fail READ early, if we can not serve it.

	 * We must do this before req is registered on any lists.

	 * Otherwise, drbd_req_complete() will queue failed READ for retry. */

	if (rw != WRITE) {

drivers/block/drbd/drbd_worker.c

+19 −11
Original line number Diff line number Diff line
@@ -248,18 +248,26 @@ void drbd_request_endio(struct bio *bio) 


	/* to avoid recursion in __req_mod */

	if (unlikely(bio->bi_error)) {

		if (bio_op(bio) == REQ_OP_DISCARD)

			what = (bio->bi_error == -EOPNOTSUPP)

				? DISCARD_COMPLETED_NOTSUPP

				: DISCARD_COMPLETED_WITH_ERROR;

		switch (bio_op(bio)) {

		case REQ_OP_DISCARD:

			if (bio->bi_error == -EOPNOTSUPP)

				what = DISCARD_COMPLETED_NOTSUPP;

			else

			what = (bio_data_dir(bio) == WRITE)

			? WRITE_COMPLETED_WITH_ERROR

			: (bio_rw(bio) == READ)

			  ? READ_COMPLETED_WITH_ERROR

			  : READ_AHEAD_COMPLETED_WITH_ERROR;

	} else

				what = DISCARD_COMPLETED_WITH_ERROR;

			break;

		case REQ_OP_READ:

			if (bio->bi_rw & REQ_RAHEAD)

				what = READ_AHEAD_COMPLETED_WITH_ERROR;

			else

				what = READ_COMPLETED_WITH_ERROR;

			break;

		default:

			what = WRITE_COMPLETED_WITH_ERROR;

			break;

		}

	} else {

		what = COMPLETED_OK;

	}



	bio_put(req->private_bio);

	req->private_bio = ERR_PTR(bio->bi_error);

drivers/block/null_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int null_lnvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd) 
	struct request *rq;

	struct bio *bio = rqd->bio;



	rq = blk_mq_alloc_request(q, bio_rw(bio), 0);

	rq = blk_mq_alloc_request(q, bio_data_dir(bio), 0);

	if (IS_ERR(rq))

		return -ENOMEM;

drivers/block/umem.c

+2 −4
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ static int add_bio(struct cardinfo *card) 
	int offset;

	struct bio *bio;

	struct bio_vec vec;

	int rw;



	bio = card->currentbio;

	if (!bio && card->bio) {
@@ -359,7 +358,6 @@ static int add_bio(struct cardinfo *card) 
	if (!bio)

		return 0;



	rw = bio_rw(bio);

	if (card->mm_pages[card->Ready].cnt >= DESC_PER_PAGE)

		return 0;
@@ -369,7 +367,7 @@ static int add_bio(struct cardinfo *card) 
				  vec.bv_page,

				  vec.bv_offset,

				  vec.bv_len,

				  (rw == READ) ?

				  bio_op(bio) == REQ_OP_READ ?

				  PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE);



	p = &card->mm_pages[card->Ready];
@@ -398,7 +396,7 @@ static int add_bio(struct cardinfo *card) 
					 DMASCR_CHAIN_EN |

					 DMASCR_SEM_EN |

					 pci_cmds);

	if (rw == WRITE)

	if (bio_op(bio) == REQ_OP_WRITE)

		desc->control_bits |= cpu_to_le32(DMASCR_TRANSFER_READ);

	desc->sem_control_bits = desc->control_bits;