Commit cb78b285 authored by Jens Axboe's avatar Jens Axboe Committed by Jens Axboe
Browse files

[PATCH] Drop useless bio passing in may_queue/set_request API 



It's not needed for anything, so kill the bio passing.

Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent cdd60262

block/as-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ static void as_work_handler(void *data) 
	spin_unlock_irqrestore(q->queue_lock, flags);

}



static int as_may_queue(request_queue_t *q, int rw, struct bio *bio)

static int as_may_queue(request_queue_t *q, int rw)

{

	int ret = ELV_MQUEUE_MAY;

	struct as_data *ad = q->elevator->elevator_data;

block/cfq-iosched.c

+2 −3
Original line number Diff line number Diff line
@@ -1752,7 +1752,7 @@ __cfq_may_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq, 
	return ELV_MQUEUE_MAY;

}



static int cfq_may_queue(request_queue_t *q, int rw, struct bio *bio)

static int cfq_may_queue(request_queue_t *q, int rw)

{

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

	struct task_struct *tsk = current;
@@ -1817,8 +1817,7 @@ static void cfq_put_request(request_queue_t *q, struct request *rq) 
 * Allocate cfq data structures associated with this request.

 */

static int

cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio,

		gfp_t gfp_mask)

cfq_set_request(request_queue_t *q, struct request *rq, gfp_t gfp_mask)

{

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

	struct task_struct *tsk = current;

block/elevator.c

+4 −5
Original line number Diff line number Diff line
@@ -796,13 +796,12 @@ struct request *elv_former_request(request_queue_t *q, struct request *rq) 
	return NULL;

}



int elv_set_request(request_queue_t *q, struct request *rq, struct bio *bio,

		    gfp_t gfp_mask)

int elv_set_request(request_queue_t *q, struct request *rq, gfp_t gfp_mask)

{

	elevator_t *e = q->elevator;



	if (e->ops->elevator_set_req_fn)

		return e->ops->elevator_set_req_fn(q, rq, bio, gfp_mask);

		return e->ops->elevator_set_req_fn(q, rq, gfp_mask);



	rq->elevator_private = NULL;

	return 0;
@@ -816,12 +815,12 @@ void elv_put_request(request_queue_t *q, struct request *rq) 
		e->ops->elevator_put_req_fn(q, rq);

}



int elv_may_queue(request_queue_t *q, int rw, struct bio *bio)

int elv_may_queue(request_queue_t *q, int rw)

{

	elevator_t *e = q->elevator;



	if (e->ops->elevator_may_queue_fn)

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

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



	return ELV_MQUEUE_MAY;

}

block/ll_rw_blk.c

+4 −5
Original line number Diff line number Diff line
@@ -2003,8 +2003,7 @@ static inline void blk_free_request(request_queue_t *q, struct request *rq) 
}



static inline struct request *

blk_alloc_request(request_queue_t *q, int rw, struct bio *bio,

		  int priv, gfp_t gfp_mask)

blk_alloc_request(request_queue_t *q, int rw, int priv, gfp_t gfp_mask)

{

	struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask);
@@ -2018,7 +2017,7 @@ blk_alloc_request(request_queue_t *q, int rw, struct bio *bio, 
	rq->cmd_flags = rw | REQ_ALLOCED;



	if (priv) {

		if (unlikely(elv_set_request(q, rq, bio, gfp_mask))) {

		if (unlikely(elv_set_request(q, rq, gfp_mask))) {

			mempool_free(rq, q->rq.rq_pool);

			return NULL;

		}
@@ -2109,7 +2108,7 @@ static struct request *get_request(request_queue_t *q, int rw, struct bio *bio, 
	struct io_context *ioc = NULL;

	int may_queue, priv;



	may_queue = elv_may_queue(q, rw, bio);

	may_queue = elv_may_queue(q, rw);

	if (may_queue == ELV_MQUEUE_NO)

		goto rq_starved;
@@ -2157,7 +2156,7 @@ static struct request *get_request(request_queue_t *q, int rw, struct bio *bio, 


	spin_unlock_irq(q->queue_lock);



	rq = blk_alloc_request(q, rw, bio, priv, gfp_mask);

	rq = blk_alloc_request(q, rw, priv, gfp_mask);

	if (unlikely(!rq)) {

		/*

		 * Allocation failed presumably due to memory. Undo anything

include/linux/elevator.h

+4 −4
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ typedef void (elevator_add_req_fn) (request_queue_t *, struct request *); 
typedef int (elevator_queue_empty_fn) (request_queue_t *);

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

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

typedef int (elevator_may_queue_fn) (request_queue_t *, int, struct bio *);

typedef int (elevator_may_queue_fn) (request_queue_t *, int);



typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, struct bio *, gfp_t);

typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, gfp_t);

typedef void (elevator_put_req_fn) (request_queue_t *, struct request *);

typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *);

typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *);
@@ -105,9 +105,9 @@ extern struct request *elv_former_request(request_queue_t *, struct request *); 
extern struct request *elv_latter_request(request_queue_t *, struct request *);

extern int elv_register_queue(request_queue_t *q);

extern void elv_unregister_queue(request_queue_t *q);

extern int elv_may_queue(request_queue_t *, int, struct bio *);

extern int elv_may_queue(request_queue_t *, int);

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

extern int elv_set_request(request_queue_t *, struct request *, struct bio *, gfp_t);

extern int elv_set_request(request_queue_t *, struct request *, gfp_t);

extern void elv_put_request(request_queue_t *, struct request *);



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE