lkml.org 
[lkml]   [2008]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][PATCH 2/3] Have __make_request skip merges when disabled


    Signed-off-by: Alan D. Brunelle <alan.brunelle@hp.com>
    ---
    block/blk-core.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/block/blk-core.c b/block/blk-core.c
    index 2a438a9..54a2d8b 100644
    --- a/block/blk-core.c
    +++ b/block/blk-core.c
    @@ -1115,7 +1115,7 @@ static int __make_request(struct request_queue *q, struct bio *bio)

    spin_lock_irq(q->queue_lock);

    - if (unlikely(barrier) || elv_queue_empty(q))
    + if (blk_queue_nomerges(q) || unlikely(barrier) || elv_queue_empty(q))
    goto get_rq;

    el_ret = elv_merge(q, &req, bio);
    --
    1.5.2.5
    \
     
     \ /
      Last update: 2008-04-23 21:17    [W:0.020 / U:1.696 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site