Linus Torvalds ee89f81252 Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block ... Pull block IO core bits from Jens Axboe: "Below are the core block IO bits for 3.9. It was delayed a few days since my workstation kept crashing every 2-8h after pulling it into current -git, but turns out it is a bug in the new pstate code (divide by zero, will report separately). In any case, it contains: - The big cfq/blkcg update from Tejun and and Vivek. - Additional block and writeback tracepoints from Tejun. - Improvement of the should sort (based on queues) logic in the plug flushing. - _io() variants of the wait_for_completion() interface, using io_schedule() instead of schedule() to contribute to io wait properly. - Various little fixes. You'll get two trivial merge conflicts, which should be easy enough to fix up" Fix up the trivial conflicts due to hlist traversal cleanups (commit b67bfe0d42: "hlist: drop the node parameter from iterators"). * 'for-3.9/core' of git://git.kernel.dk/linux-block: (39 commits) block: remove redundant check to bd_openers() block: use i_size_write() in bd_set_size() cfq: fix lock imbalance with failed allocations drivers/block/swim3.c: fix null pointer dereference block: don't select PERCPU_RWSEM block: account iowait time when waiting for completion of IO request sched: add wait_for_completion_io[_timeout] writeback: add more tracepoints block: add block_{touch|dirty}_buffer tracepoint buffer: make touch_buffer() an exported function block: add @req to bio_{front|back}_merge tracepoints block: add missing block_bio_complete() tracepoint block: Remove should_sort judgement when flush blk_plug block,elevator: use new hashtable implementation cfq-iosched: add hierarchical cfq_group statistics cfq-iosched: collect stats from dead cfqgs cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats() blkcg: make blkcg_print_blkgs() grab q locks instead of blkcg lock block: RCU free request_queue blkcg: implement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge() ...		2013-02-28 12:52:24 -08:00
..
persistent-data	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
bitmap.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
bitmap.h
dm-bio-prison.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
dm-bio-prison.h	dm thin: replace dm_cell_release_singleton with cell_defer_except	2012-12-21 20:23:31 +00:00
dm-bio-record.h
dm-bufio.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
dm-bufio.h
dm-crypt.c	dm: remove map_info	2012-12-21 20:23:41 +00:00
dm-delay.c	dm: remove map_info	2012-12-21 20:23:41 +00:00
dm-exception-store.c
dm-exception-store.h
dm-flakey.c	dm: remove map_info	2012-12-21 20:23:41 +00:00
dm-io.c	dm kcopyd: add WRITE SAME support to dm_kcopyd_zero	2012-12-21 20:23:37 +00:00
dm-ioctl.c	dm ioctl: use kmalloc if possible	2012-12-21 20:23:36 +00:00
dm-kcopyd.c	dm kcopyd: add WRITE SAME support to dm_kcopyd_zero	2012-12-21 20:23:37 +00:00
dm-linear.c	dm: remove map_info	2012-12-21 20:23:41 +00:00
dm-log-userspace-base.c
dm-log-userspace-transfer.c
dm-log-userspace-transfer.h
dm-log.c	dm: use memweight()	2012-07-30 17:25:16 -07:00
dm-mpath.c	dm mpath: fix check for null mpio in end_io fn	2012-10-12 16:59:42 +01:00
dm-mpath.h
dm-path-selector.c
dm-path-selector.h
dm-queue-length.c
dm-raid1.c	dm: remove map_info	2012-12-21 20:23:41 +00:00
dm-raid.c	DM-RAID: Fix RAID10's check for sufficient redundancy	2013-01-24 12:02:36 +11:00
dm-region-hash.c
dm-round-robin.c
dm-service-time.c
dm-snap-persistent.c
dm-snap-transient.c
dm-snap.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
dm-stripe.c	dm stripe: add WRITE SAME support	2012-12-21 20:23:41 +00:00
dm-sysfs.c
dm-table.c	dm: introduce per_bio_data	2012-12-21 20:23:38 +00:00
dm-target.c	dm: remove map_info	2012-12-21 20:23:41 +00:00
dm-thin-metadata.c	dm persistent data: fix nested btree deletion	2012-12-21 20:23:32 +00:00
dm-thin-metadata.h	dm thin metadata: introduce dm_pool_abort_metadata	2012-07-27 15:08:15 +01:00
dm-thin.c	dm thin: fix queue limits stacking	2013-01-31 14:11:14 +00:00
dm-uevent.c
dm-uevent.h
dm-verity.c	dm: remove map_info	2012-12-21 20:23:41 +00:00
dm-zero.c	dm: remove map_info	2012-12-21 20:23:41 +00:00
dm.c	Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block	2013-02-28 12:52:24 -08:00
dm.h	dm: introduce per_bio_data	2012-12-21 20:23:38 +00:00
faulty.c	md faulty: use disk_stack_limits()	2012-10-22 10:44:55 +11:00
Kconfig	dm thin: move bio_prison code to separate module	2012-10-12 21:02:13 +01:00
linear.c	md: linear supports TRIM	2012-10-11 13:08:44 +11:00
linear.h
Makefile	dm thin: move bio_prison code to separate module	2012-10-12 21:02:13 +01:00
md.c	md update for 3.8	2012-12-18 09:32:44 -08:00
md.h	md update for 3.8	2012-12-18 09:32:44 -08:00
multipath.c	MD: change the parameter of md thread	2012-10-11 13:34:00 +11:00
multipath.h
raid0.c	md: raid 0 supports TRIM	2012-10-11 13:25:44 +11:00
raid0.h
raid1.c	Merge branch 'for-3.8/drivers' of git://git.kernel.dk/linux-block	2012-12-17 13:39:11 -08:00
raid1.h	md/raid1: prevent merging too large request	2012-07-31 10:03:53 +10:00
raid5.c	Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block	2013-02-28 12:52:24 -08:00
raid5.h	MD: raid5 trim support	2012-10-11 13:49:05 +11:00
raid10.c	Merge branch 'for-3.8/drivers' of git://git.kernel.dk/linux-block	2012-12-17 13:39:11 -08:00
raid10.h	md/raid10: fix problem with on-stack allocation of r10bio structure.	2012-08-18 09:51:42 +10:00