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
..
partitions	separate partition format handling from generic code	2012-01-03 22:54:06 -05:00
blk-cgroup.c	block: strip out locking optimization in put_io_context()	2012-02-07 07:51:30 +01:00
blk-cgroup.h	block: fix a typo in the blk-cgroup.h file	2011-10-24 16:08:38 +02:00
blk-core.c	block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions	2012-02-08 09:19:38 +01:00
blk-exec.c	block: add missing blk_queue_dead() checks	2011-12-14 00:33:37 +01:00
blk-flush.c	blk-flush: move the queue kick into	2011-10-24 16:24:31 +02:00
blk-integrity.c	block: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros	2011-10-31 19:31:12 -04:00
blk-ioc.c	block: strip out locking optimization in put_io_context()	2012-02-07 07:51:30 +01:00
blk-iopoll.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
blk-lib.c	block: fix patch import error in max_discard_sectors check	2011-07-23 20:34:59 +02:00
blk-map.c	block: re-use existing 'reading' variable instead of checking direction again	2011-12-21 15:27:24 +01:00
blk-merge.c	block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions	2012-02-08 09:19:38 +01:00
blk-settings.c	block: Introduce blk_set_stacking_limits function	2012-01-11 16:27:11 +01:00
blk-softirq.c	block: Don't check QUEUE_FLAG_SAME_COMP in __blk_complete_request	2011-09-14 09:31:01 +02:00
blk-sysfs.c	block, cfq: move io_cq exit/release to blk-ioc.c	2011-12-14 00:33:42 +01:00
blk-tag.c	block: fix blk_queue_end_tag()	2011-12-29 09:16:28 +01:00
blk-throttle.c	block: add blk_queue_dead()	2011-12-14 00:33:37 +01:00
blk-timeout.c	fault-injection: add ability to export fault_attr in arbitrary directory	2011-08-03 14:25:20 -10:00
blk.h	block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions	2012-02-08 09:19:38 +01:00
bsg-lib.c	block: Change module.h -> export.h in bsg-lib.c	2011-10-31 19:31:13 -04:00
bsg.c	Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block	2012-01-15 12:24:45 -08:00
cfq-iosched.c	block: strip out locking optimization in put_io_context()	2012-02-07 07:51:30 +01:00
cfq.h	blk-cgroup: Add unaccounted time to timeslice_used.	2011-03-12 16:54:00 +01:00
compat_ioctl.c	block: Add BLKROTATIONAL ioctl	2012-01-11 16:29:31 +01:00
deadline-iosched.c	block, cfq: move icq cache management to block core	2011-12-14 00:33:42 +01:00
elevator.c	block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions	2012-02-08 09:19:38 +01:00
genhd.c	Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block	2012-01-15 12:24:45 -08:00
ioctl.c	Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block	2012-01-15 12:24:45 -08:00
Kconfig	move fs/partitions to block/	2012-01-03 22:54:06 -05:00
Kconfig.iosched	blk-cgroup: config options re-arrangement	2010-04-26 19:27:56 +02:00
Makefile	separate partition format handling from generic code	2012-01-03 22:54:06 -05:00
noop-iosched.c	block, cfq: move icq cache management to block core	2011-12-14 00:33:42 +01:00
partition-generic.c	separate partition format handling from generic code	2012-01-03 22:54:06 -05:00
scsi_ioctl.c	block: fail SCSI passthrough ioctls on partition devices	2012-01-14 15:07:24 -08:00