lkml.org 
[lkml]   [2014]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/8] block: move flush initialized stuff to blk_flush_init
    Date
    These stuff is always used with flush req together, so
    we can do that safely.

    Signed-off-by: Ming Lei <ming.lei@canonical.com>
    ---
    block/blk-core.c | 3 ---
    block/blk-flush.c | 4 ++++
    2 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/block/blk-core.c b/block/blk-core.c
    index 0a9d172..222fe84 100644
    --- a/block/blk-core.c
    +++ b/block/blk-core.c
    @@ -600,9 +600,6 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
    #ifdef CONFIG_BLK_CGROUP
    INIT_LIST_HEAD(&q->blkg_list);
    #endif
    - INIT_LIST_HEAD(&q->flush_queue[0]);
    - INIT_LIST_HEAD(&q->flush_queue[1]);
    - INIT_LIST_HEAD(&q->flush_data_in_flight);
    INIT_DELAYED_WORK(&q->delay_work, blk_delay_work);

    kobject_init(&q->kobj, &blk_queue_ktype);
    diff --git a/block/blk-flush.c b/block/blk-flush.c
    index 6932ee8..a5b2a00 100644
    --- a/block/blk-flush.c
    +++ b/block/blk-flush.c
    @@ -490,6 +490,10 @@ static int blk_mq_init_flush(struct request_queue *q)

    int blk_init_flush(struct request_queue *q)
    {
    + INIT_LIST_HEAD(&q->flush_queue[0]);
    + INIT_LIST_HEAD(&q->flush_queue[1]);
    + INIT_LIST_HEAD(&q->flush_data_in_flight);
    +
    if (q->mq_ops)
    return blk_mq_init_flush(q);

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-09-09 15:41    [W:3.431 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site