Tejun Heo 050c8ea80e
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 >
2012-02-08 09:19:38 +01:00
2012-01-17 18:40:24 -08:00
2012-01-17 09:54:08 -05:00
2012-01-04 17:30:20 -02:00
2012-01-09 00:37:40 +01:00
2011-12-30 15:25:52 -08:00
2012-01-13 09:32:20 +10:30
2012-01-13 20:43:32 -08:00
2012-01-14 12:32:16 -08:00
2012-01-17 18:40:24 -08:00
2012-01-16 14:01:23 +01:00
2011-12-27 20:31:38 +01:00
2012-01-03 09:10:09 +01:00
2012-01-09 14:21:03 -08:00
2012-01-06 05:22:21 +04:00
2012-01-03 20:20:01 +00:00
2012-01-14 12:26:41 -08:00
2012-01-04 15:52:42 -08:00
2012-01-17 04:35:20 -05:00
2012-01-18 15:51:48 -08:00
2012-01-08 19:14:59 -05:00
2012-01-17 16:17:03 -05:00
2012-01-13 08:15:33 +01:00
2012-02-07 07:51:30 +01:00
2012-01-14 18:36:33 -08:00
2012-01-09 12:59:24 -08:00
2011-12-28 21:25:35 +08:00
2012-01-03 22:55:19 -05:00
2012-01-10 16:30:42 -08:00
2012-01-10 16:30:42 -08:00
2012-01-03 22:54:57 -05:00
2012-01-13 09:32:20 +10:30
2012-01-07 12:03:30 -08:00
2012-01-18 15:51:48 -08:00
2012-01-12 20:13:11 -08:00
2012-01-05 18:52:59 -05:00
2012-01-13 10:29:21 -08:00
2012-01-08 12:19:57 -08:00
2012-01-08 12:19:57 -08:00
2012-01-18 10:46:21 +11:00
2012-01-04 08:56:31 -06:00
2012-01-06 10:20:21 +00:00
2012-02-08 09:19:38 +01:00
2012-01-04 14:10:28 -05:00
2012-01-12 20:13:04 -08:00
2012-01-03 22:54:58 -05:00
2011-12-27 01:06:33 +01:00
2012-01-15 12:24:45 -08:00
2012-01-07 17:26:49 -05:00
2012-01-03 22:54:55 -05:00
2012-01-10 16:30:43 -08:00
2012-01-11 09:23:05 +00:00
2012-01-09 11:24:59 +01:00
2012-01-12 20:13:08 -08:00
2012-01-04 16:13:05 -08:00
2012-01-06 11:42:52 -08:00
2012-01-03 22:54:56 -05:00
2012-01-11 12:56:06 -08:00
2012-01-09 12:59:24 -08:00
2012-01-13 09:32:18 +10:30
2012-02-07 07:51:30 +01:00
2012-01-09 13:06:28 +01:00
2012-01-03 22:55:17 -05:00
2012-01-03 22:54:55 -05:00
2011-12-28 17:46:46 -05:00
2012-01-09 13:52:09 +01:00
2011-12-30 16:42:19 -05:00
2012-01-12 20:13:03 -08:00
2012-01-18 10:41:29 +11:00
2012-01-12 20:13:11 -08:00
2012-01-17 15:40:51 -08:00
2011-12-27 11:24:29 +02:00
2011-12-27 11:26:41 +02:00
2011-12-26 13:27:44 +02:00
2012-01-10 16:30:49 -08:00
2012-01-12 20:13:03 -08:00
2012-01-04 16:25:45 +04:00
2012-01-12 20:13:07 -08:00
2012-01-10 16:30:45 -08:00
2012-01-12 20:13:09 -08:00
2012-01-13 10:12:23 -08:00
2012-01-12 20:13:10 -08:00
2012-01-12 20:13:03 -08:00
2012-01-11 19:12:10 -08:00
2012-01-12 20:13:10 -08:00
2012-01-03 22:57:13 -05:00
2012-01-13 20:43:32 -08:00
2012-01-13 09:32:14 +10:30
2012-01-13 09:32:28 +10:30
2012-01-03 22:57:12 -05:00
2012-01-06 12:10:25 -08:00
2012-01-09 14:46:52 -08:00
2012-01-04 14:30:43 -05:00
2012-01-05 11:59:18 -05:00
2012-01-03 22:52:34 -05:00
2012-01-07 13:22:46 -05:00
2012-01-07 13:22:46 -05:00
2011-12-27 10:57:13 -06:00
2012-01-07 12:18:52 -08:00
2012-01-12 20:13:06 -08:00
2012-01-12 20:13:07 -08:00
2012-01-10 16:30:42 -08:00
2012-01-12 20:13:10 -08:00
2012-01-06 12:11:40 -08:00
2012-01-11 18:50:26 -08:00
2012-01-06 12:10:26 -08:00
2012-01-06 12:15:21 -08:00
2012-01-12 15:23:04 -08:00
2012-01-10 16:30:54 -08:00
2012-01-12 20:05:28 -08:00
2012-01-08 13:10:57 -08:00
2012-01-04 09:09:35 +04:00
2012-01-12 20:13:13 -08:00
2012-01-10 16:30:54 -08:00
2012-01-17 16:41:31 -08:00
2012-01-12 20:13:12 -08:00
2012-01-03 22:55:07 -05:00
2012-01-06 23:20:13 -05:00
2012-01-06 23:20:13 -05:00
2012-01-03 22:54:56 -05:00
2012-01-12 20:13:06 -08:00
2012-01-06 06:13:35 +04:00
2012-01-12 20:13:03 -08:00
2012-01-14 18:36:33 -08:00
2012-01-03 22:52:40 -05:00
2012-01-14 13:05:21 -08:00
2012-01-06 11:40:11 +05:30
2012-01-09 09:33:57 +09:00
2012-01-03 22:55:07 -05:00
2012-01-10 16:30:54 -08:00
2012-01-05 14:01:21 -05:00
2012-01-09 14:19:33 -08:00
2012-01-03 20:23:18 -05:00
2011-12-30 16:42:19 -05:00
2012-01-10 16:30:43 -08:00
2012-01-03 22:55:19 -05:00
2012-01-03 22:55:12 -05:00
2012-01-03 22:54:56 -05:00
2012-01-17 10:30:38 -08:00
2012-01-08 13:21:22 -08:00
2012-01-04 22:19:55 -08:00
2011-12-30 16:46:02 -05:00
2012-01-09 12:09:47 -08:00
2012-01-15 12:49:56 -08:00
2012-01-12 15:44:42 +10:30
2012-01-12 15:44:44 +10:30
2012-01-06 15:22:04 +01:00
2012-01-10 16:30:54 -08:00
2012-01-10 16:59:59 -08:00
050c8ea80e