Files
ubports_kernel_google_msm/include/linux
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
..
2011-12-13 15:30:49 -05:00
2012-01-04 15:52:42 -08:00
2011-11-02 16:07:03 -07:00
2011-10-26 15:43:25 -04:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-08-03 11:30:42 -04:00
2011-07-31 22:05:09 +02:00
2011-07-26 16:49:47 -07:00
2012-01-10 16:30:42 -08:00
2012-01-03 22:54:57 -05:00
2011-08-25 16:25:33 -07:00
2011-10-29 21:20:22 +02:00
2011-07-25 20:57:16 -07:00
2011-12-13 09:26:45 +00:00
2011-07-26 16:49:47 -07:00
2011-11-07 23:54:53 +01:00
2012-01-04 08:56:31 -06:00
2011-10-31 20:19:04 +00:00
2011-11-26 14:59:39 -05:00
2011-12-09 17:35:51 -08:00
2011-12-11 18:25:16 -05:00
2012-01-12 20:13:04 -08:00
2011-09-14 15:24:51 -04:00
2012-01-03 22:54:58 -05:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-12-13 11:58:49 +01:00
2012-01-12 20:13:08 -08:00
2012-01-03 22:54:56 -05:00
2011-11-16 18:16:38 -05:00
2011-11-13 16:10:10 -05:00
2012-01-03 22:55:17 -05:00
2011-12-11 18:25:16 -05:00
2011-09-27 18:08:04 +02:00
2012-01-09 13:52:09 +01:00
2011-07-26 16:49:47 -07:00
2012-01-12 20:13:11 -08:00
2012-01-17 15:40:51 -08:00
2011-12-27 11:26:41 +02:00
2011-09-16 19:20:20 -04:00
2011-07-26 16:49:47 -07:00
2012-01-12 20:13:10 -08:00
2011-07-26 16:49:47 -07:00
2011-11-14 00:47:54 -05:00
2011-07-31 12:18:16 -04:00
2011-10-31 14:03:22 +01:00
2012-01-06 12:10:26 -08:00
2012-01-12 15:23:04 -08:00
2011-12-13 09:26:45 +00:00
2011-11-02 16:07:02 -07:00
2011-07-26 16:49:47 -07:00
2012-01-03 22:55:07 -05:00
2012-01-03 22:54:56 -05:00
2011-07-26 14:50:01 -07:00
2012-01-03 22:52:40 -05:00
2012-01-09 09:33:57 +09:00
2011-07-30 08:44:19 -10:00
2011-07-26 16:49:47 -07:00
2011-12-13 09:26:45 +00:00
2011-07-26 16:49:47 -07:00
2011-07-25 20:57:11 -07:00
2011-10-31 17:30:47 -07:00
2011-08-16 00:16:49 -07:00
2011-08-03 14:25:22 -10:00
2012-01-03 22:54:56 -05:00
2011-11-02 16:07:02 -07:00
2011-07-26 16:49:47 -07:00
2011-09-14 15:24:51 -04:00