diff options
| author | Tejun Heo <tj@kernel.org> | 2012-02-08 09:19:38 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-02-08 09:19:38 +0100 |
| commit | 050c8ea80e3e90019d9e981c6a117ef614e882ed (patch) | |
| tree | e1c53f17a93ba48b9aedb0c1560dfb022733845f /mm | |
| parent | 4e8670e26135d8fbfd5e084fddc1a8ed9f8eb4cb (diff) | |
block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions
blk_rq_merge_ok() is the elevator-neutral part of merge eligibility
test. blk_try_merge() determines merge direction and expects the
caller to have tested elv_rq_merge_ok() previously.
elv_rq_merge_ok() now wraps blk_rq_merge_ok() and then calls
elv_iosched_allow_merge(). elv_try_merge() is removed and the two
callers are updated to call elv_rq_merge_ok() explicitly followed by
blk_try_merge(). While at it, make rq_merge_ok() functions return
bool.
This is to prepare for plug merge update and doesn't introduce any
behavior change.
This is based on Jens' patch to skip elevator_allow_merge_fn() from
plug merge.
Signed-off-by: Tejun Heo <tj@kernel.org>
LKML-Reference: <4F16F3CA.90904@kernel.dk>
Original-patch-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions