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

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

block: introduce blk_rq_is_passthrough 



This can be used to check for fs vs non-fs requests and basically
removes all knowledge of BLOCK_PC specific from the block layer,
as well as preparing for removing the cmd_type field in struct request.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 09fc54cc

block/blk-core.c

+4 −4
Original line number Diff line number Diff line
@@ -2506,10 +2506,10 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) 
	 * TODO: tj: This is too subtle.  It would be better to let

	 * low level drivers do what they see fit.

	 */

	if (req->cmd_type == REQ_TYPE_FS)

	if (!blk_rq_is_passthrough(req))

		req->errors = 0;



	if (error && req->cmd_type == REQ_TYPE_FS &&

	if (error && !blk_rq_is_passthrough(req) &&

	    !(req->rq_flags & RQF_QUIET)) {

		char *error_type;
@@ -2581,7 +2581,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) 
	req->__data_len -= total_bytes;



	/* update sector only for requests with clear definition of sector */

	if (req->cmd_type == REQ_TYPE_FS)

	if (!blk_rq_is_passthrough(req))

		req->__sector += total_bytes >> 9;



	/* mixed attributes always follow the first bio */
@@ -2659,7 +2659,7 @@ void blk_finish_request(struct request *req, int error) 


	BUG_ON(blk_queued_rq(req));



	if (unlikely(laptop_mode) && req->cmd_type == REQ_TYPE_FS)

	if (unlikely(laptop_mode) && !blk_rq_is_passthrough(req))

		laptop_io_completion(&req->q->backing_dev_info);



	blk_delete_timer(req);

block/blk-exec.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 
	int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;



	WARN_ON(irqs_disabled());

	WARN_ON(rq->cmd_type == REQ_TYPE_FS);

	WARN_ON(!blk_rq_is_passthrough(rq));



	rq->rq_disk = bd_disk;

	rq->end_io = done;

block/blk.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static inline int blk_do_io_stat(struct request *rq) 
{

	return rq->rq_disk &&

	       (rq->rq_flags & RQF_IO_STAT) &&

		(rq->cmd_type == REQ_TYPE_FS);

		!blk_rq_is_passthrough(rq);

}



/*

block/elevator.c

+2 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where) 


	if (rq->rq_flags & RQF_SOFTBARRIER) {

		/* barriers are scheduling boundary, update end_sector */

		if (rq->cmd_type == REQ_TYPE_FS) {

		if (!blk_rq_is_passthrough(rq)) {

			q->end_sector = rq_end_sector(rq);

			q->boundary_rq = rq;

		}
@@ -676,7 +676,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where) 
		if (elv_attempt_insert_merge(q, rq))

			break;

	case ELEVATOR_INSERT_SORT:

		BUG_ON(rq->cmd_type != REQ_TYPE_FS);

		BUG_ON(blk_rq_is_passthrough(rq));

		rq->rq_flags |= RQF_SORTED;

		q->nr_sorted++;

		if (rq_mergeable(rq)) {

block/mq-deadline.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, 
	if (blk_mq_sched_bypass_insert(hctx, rq))

		return;



	if (at_head || rq->cmd_type != REQ_TYPE_FS) {

	if (at_head || blk_rq_is_passthrough(rq)) {

		if (at_head)

			list_add(&rq->queuelist, &dd->dispatch);

		else