lkml.org 
[lkml]   [2009]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] CFQ: get rid of must_alloc flag
    Get rid of must_alloc flag since it's redundant now.

    Signed-off-by: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
    ---
    block/cfq-iosched.c | 6 +-----
    1 files changed, 1 insertions(+), 5 deletions(-)

    diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
    index fd7080e..f5770ad 100644
    --- a/block/cfq-iosched.c
    +++ b/block/cfq-iosched.c
    @@ -191,7 +191,6 @@ enum cfqq_state_flags {
    CFQ_CFQQ_FLAG_on_rr = 0, /* on round-robin busy list */
    CFQ_CFQQ_FLAG_wait_request, /* waiting for a request */
    CFQ_CFQQ_FLAG_must_dispatch, /* must be allowed a dispatch */
    - CFQ_CFQQ_FLAG_must_alloc, /* must be allowed rq alloc */
    CFQ_CFQQ_FLAG_must_alloc_slice, /* per-slice must_alloc flag */
    CFQ_CFQQ_FLAG_fifo_expire, /* FIFO checked in this slice */
    CFQ_CFQQ_FLAG_idle_window, /* slice idling enabled */
    @@ -218,7 +217,6 @@ static inline int cfq_cfqq_##name(const struct cfq_queue *cfqq) \
    CFQ_CFQQ_FNS(on_rr);
    CFQ_CFQQ_FNS(wait_request);
    CFQ_CFQQ_FNS(must_dispatch);
    -CFQ_CFQQ_FNS(must_alloc);
    CFQ_CFQQ_FNS(must_alloc_slice);
    CFQ_CFQQ_FNS(fifo_expire);
    CFQ_CFQQ_FNS(idle_window);
    @@ -2229,8 +2227,7 @@ static void cfq_prio_boost(struct cfq_queue *cfqq)

    static inline int __cfq_may_queue(struct cfq_queue *cfqq)
    {
    - if ((cfq_cfqq_wait_request(cfqq) || cfq_cfqq_must_alloc(cfqq)) &&
    - !cfq_cfqq_must_alloc_slice(cfqq)) {
    + if ((cfq_cfqq_wait_request(cfqq) && !cfq_cfqq_must_alloc_slice(cfqq)) {
    cfq_mark_cfqq_must_alloc_slice(cfqq);
    return ELV_MQUEUE_MUST;
    }
    @@ -2317,7 +2314,6 @@ cfq_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask)
    }

    cfqq->allocated[rw]++;
    - cfq_clear_cfqq_must_alloc(cfqq);
    atomic_inc(&cfqq->ref);

    spin_unlock_irqrestore(q->queue_lock, flags);
    --
    1.5.4.rc3



    \
     
     \ /
      Last update: 2009-08-18 07:13    [W:3.374 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site