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

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

block: prepare elevator to use REQ_OPs. 



This patch converts the elevator code to use separate variables
for the operation and flags, and to check req_op for the REQ_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 cc6e3b10

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ static struct request *__get_request(struct request_list *rl, int op, 
	if (unlikely(blk_queue_dying(q)))

		return ERR_PTR(-ENODEV);



	may_queue = elv_may_queue(q, op | op_flags);

	may_queue = elv_may_queue(q, op, op_flags);

	if (may_queue == ELV_MQUEUE_NO)

		goto rq_starved;

block/cfq-iosched.c

+2 −2
Original line number Diff line number Diff line
@@ -4285,7 +4285,7 @@ static inline int __cfq_may_queue(struct cfq_queue *cfqq) 
	return ELV_MQUEUE_MAY;

}



static int cfq_may_queue(struct request_queue *q, int rw)

static int cfq_may_queue(struct request_queue *q, int op, int op_flags)

{

	struct cfq_data *cfqd = q->elevator->elevator_data;

	struct task_struct *tsk = current;
@@ -4302,7 +4302,7 @@ static int cfq_may_queue(struct request_queue *q, int rw) 
	if (!cic)

		return ELV_MQUEUE_MAY;



	cfqq = cic_to_cfqq(cic, rw_is_sync(rw));

	cfqq = cic_to_cfqq(cic, rw_is_sync(op | op_flags));

	if (cfqq) {

		cfq_init_prio_data(cfqq, cic);

block/elevator.c

+3 −4
Original line number Diff line number Diff line
@@ -366,8 +366,7 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq) 
	list_for_each_prev(entry, &q->queue_head) {

		struct request *pos = list_entry_rq(entry);



		if ((rq->cmd_flags & REQ_DISCARD) !=

		    (pos->cmd_flags & REQ_DISCARD))

		if ((req_op(rq) == REQ_OP_DISCARD) != (req_op(pos) == REQ_OP_DISCARD))

			break;

		if (rq_data_dir(rq) != rq_data_dir(pos))

			break;
@@ -717,12 +716,12 @@ void elv_put_request(struct request_queue *q, struct request *rq) 
		e->type->ops.elevator_put_req_fn(rq);

}



int elv_may_queue(struct request_queue *q, int rw)

int elv_may_queue(struct request_queue *q, int op, int op_flags)

{

	struct elevator_queue *e = q->elevator;



	if (e->type->ops.elevator_may_queue_fn)

		return e->type->ops.elevator_may_queue_fn(q, rw);

		return e->type->ops.elevator_may_queue_fn(q, op, op_flags);



	return ELV_MQUEUE_MAY;

}

include/linux/elevator.h

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ typedef int (elevator_dispatch_fn) (struct request_queue *, int); 
typedef void (elevator_add_req_fn) (struct request_queue *, struct request *);

typedef struct request *(elevator_request_list_fn) (struct request_queue *, struct request *);

typedef void (elevator_completed_req_fn) (struct request_queue *, struct request *);

typedef int (elevator_may_queue_fn) (struct request_queue *, int);

typedef int (elevator_may_queue_fn) (struct request_queue *, int, int);



typedef void (elevator_init_icq_fn) (struct io_cq *);

typedef void (elevator_exit_icq_fn) (struct io_cq *);
@@ -134,7 +134,7 @@ extern struct request *elv_former_request(struct request_queue *, struct request 
extern struct request *elv_latter_request(struct request_queue *, struct request *);

extern int elv_register_queue(struct request_queue *q);

extern void elv_unregister_queue(struct request_queue *q);

extern int elv_may_queue(struct request_queue *, int);

extern int elv_may_queue(struct request_queue *, int, int);

extern void elv_completed_request(struct request_queue *, struct request *);

extern int elv_set_request(struct request_queue *q, struct request *rq,

			   struct bio *bio, gfp_t gfp_mask);