lkml.org 
[lkml]   [2011]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH] block: call elv_bio_merged() when merged
    From
    2011/5/20 Namhyung Kim <namhyung@gmail.com>:
    > Commit 73c101011926 ("block: initial patch for on-stack per-task plugging")
    > removed calls to elv_bio_merged() when @bio merged with @req. Re-add them.
    >
    > Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    > Cc: Divyesh Shah <dpshah@google.com>
    > ---
    >  block/blk-core.c |    2 ++
    >  1 files changed, 2 insertions(+), 0 deletions(-)
    >
    > diff --git a/block/blk-core.c b/block/blk-core.c
    > index 3fe00a14822a..4dc02ef5fc82 100644
    > --- a/block/blk-core.c
    > +++ b/block/blk-core.c
    > @@ -1132,6 +1132,7 @@ static bool bio_attempt_back_merge(struct request_queue *q, struct request *req,
    >        req->ioprio = ioprio_best(req->ioprio, bio_prio(bio));
    >
    >        drive_stat_acct(req, 0);
    > +       elv_bio_merged(q, req, bio);
    >        return true;
    >  }
    >
    > @@ -1173,6 +1174,7 @@ static bool bio_attempt_front_merge(struct request_queue *q,
    >        req->ioprio = ioprio_best(req->ioprio, bio_prio(bio));
    >
    >        drive_stat_acct(req, 0);
    > +       elv_bio_merged(q, req, bio);
    >        return true;
    >  }
    Looks you should do this in __make_request. when the routine is called
    in attempt_plug_merge, the request isn't added to elevator yet.

    Thanks,
    Shaohua
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-05-20 10:35    [W:0.046 / U:0.208 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site