lkml.org 
[lkml]   [2016]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 29/42] block: prepare elevator to use REQ_OPs.
    Date
    From: Mike Christie <mchristi@redhat.com>

    This patch converts the elevator code to use separate variables
    for the operation and flags, and to check request->op for the REQ_OP.

    Signed-off-by: Mike Christie <mchristi@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Hannes Reinecke <hare@suse.com>
    ---
    block/blk-core.c | 2 +-
    block/cfq-iosched.c | 4 ++--
    block/elevator.c | 7 +++----
    include/linux/elevator.h | 4 ++--
    4 files changed, 8 insertions(+), 9 deletions(-)

    diff --git a/block/blk-core.c b/block/blk-core.c
    index 3168962..a796b35 100644
    --- a/block/blk-core.c
    +++ b/block/blk-core.c
    @@ -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;

    diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
    index 4a34978..3fcc598 100644
    --- a/block/cfq-iosched.c
    +++ b/block/cfq-iosched.c
    @@ -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);

    diff --git a/block/elevator.c b/block/elevator.c
    index c3555c9..6a282bf 100644
    --- a/block/elevator.c
    +++ b/block/elevator.c
    @@ -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 ((rq->op == REQ_OP_DISCARD) != (pos->op == 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;
    }
    diff --git a/include/linux/elevator.h b/include/linux/elevator.h
    index 638b324..953d286 100644
    --- a/include/linux/elevator.h
    +++ b/include/linux/elevator.h
    @@ -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);
    --
    2.7.2
    \
     
     \ /
      Last update: 2016-04-15 21:41    [W:3.074 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site