Linus Torvalds 36805aaea5
Merge branch 'for-3.11/core' of git://git.kernel.dk/linux-block ...
Pull core block IO updates from Jens Axboe:
"Here are the core IO block bits for 3.11. It contains:
- A tweak to the reserved tag logic from Jan, for weirdo devices with
just 3 free tags. But for those it improves things substantially
for random writes.
- Periodic writeback fix from Jan. Marked for stable as well.
- Fix for a race condition in IO scheduler switching from Jianpeng.
- The hierarchical blk-cgroup support from Tejun. This is the grunt
of the series.
- blk-throttle fix from Vivek.
Just a note that I'm in the middle of a relocation, whole family is
flying out tomorrow. Hence I will be awal the remainder of this week,
but back at work again on Monday the 15th. CC'ing Tejun, since any
potential "surprises" will most likely be from the blk-cgroup work.
But it's been brewing for a while and sitting in my tree and
linux-next for a long time, so should be solid."
* 'for-3.11/core' of git://git.kernel.dk/linux-block: (36 commits)
elevator: Fix a race in elevator switching
block: Reserve only one queue tag for sync IO if only 3 tags are available
writeback: Fix periodic writeback after fs mount
blk-throttle: implement proper hierarchy support
blk-throttle: implement throtl_grp->has_rules[]
blk-throttle: Account for child group's start time in parent while bio climbs up
blk-throttle: add throtl_qnode for dispatch fairness
blk-throttle: make throtl_pending_timer_fn() ready for hierarchy
blk-throttle: make tg_dispatch_one_bio() ready for hierarchy
blk-throttle: make blk_throtl_bio() ready for hierarchy
blk-throttle: make blk_throtl_drain() ready for hierarchy
blk-throttle: dispatch from throtl_pending_timer_fn()
blk-throttle: implement dispatch looping
blk-throttle: separate out throtl_service_queue->pending_timer from throtl_data->dispatch_work
blk-throttle: set REQ_THROTTLED from throtl_charge_bio() and gate stats update with it
blk-throttle: implement sq_to_tg(), sq_to_td() and throtl_log()
blk-throttle: add throtl_service_queue->parent_sq
blk-throttle: generalize update_disptime optimization in blk_throtl_bio()
blk-throttle: dispatch to throtl_data->service_queue.bio_lists[]
blk-throttle: move bio_lists[] and friends to throtl_service_queue
...
2013-07-11 13:03:24 -07:00
2013-07-05 11:40:47 +05:30
2013-06-27 13:42:16 -04:00
2013-06-27 15:15:32 +02:00
2013-07-09 12:18:06 -07:00
2013-07-03 11:54:50 -07:00
2013-07-09 10:33:30 -07:00
2013-06-20 10:26:29 +02:00
2013-06-05 18:41:23 +01:00
2013-07-10 11:10:27 -07:00
2013-07-10 11:16:00 -07:00
2013-07-01 13:10:57 -07:00
2013-07-05 12:48:35 -04:00
2013-05-09 10:15:46 -07:00
2013-04-29 20:09:03 +02:00
2013-06-25 15:34:44 +02:00
2013-07-11 12:35:09 -07:00
2013-06-10 10:46:18 -07:00
2013-07-01 11:17:08 +01:00
2013-06-26 16:21:06 +01:00
2013-06-17 14:38:54 -04:00
2013-07-11 10:17:13 -07:00
2013-07-02 13:43:38 -07:00
2013-05-14 10:23:57 +05:30
2013-06-19 01:02:50 +02:00
2013-07-03 16:31:35 -07:00
2013-05-07 19:46:02 -07:00
2013-05-29 12:57:34 -07:00
2013-05-29 15:50:34 -04:00
2013-07-03 16:07:42 -07:00
2013-07-09 10:33:19 -07:00
2013-07-03 16:07:43 -07:00
2013-04-29 15:40:23 -04:00
2013-07-08 01:23:15 -07:00
2013-05-08 10:13:35 -07:00
2013-05-08 10:13:35 -07:00
2013-07-03 16:07:39 -07:00
2013-05-15 14:42:15 -07:00
2013-07-03 16:07:29 -07:00
2013-07-11 13:03:24 -07:00
2013-04-30 17:04:01 -07:00
2013-06-15 20:23:53 -07:00
2013-05-16 11:09:18 +02:00
2013-07-05 11:09:28 +02:00
2013-05-09 13:46:38 -04:00
2013-04-29 18:28:13 -07:00
2013-06-19 12:58:42 +02:00
2013-05-20 12:27:59 -07:00
2013-05-31 11:32:30 +02:00
2013-07-08 10:13:40 -04:00
2013-07-04 11:40:58 -07:00
2013-07-04 13:12:44 +02:00
2013-06-11 13:42:38 +02:00
2013-05-01 17:51:54 -07:00
2013-05-20 20:11:01 +08:00
2013-04-29 18:28:19 -07:00
2013-07-05 18:59:33 +04:00
2013-05-12 14:16:21 +02:00
2013-06-03 13:55:01 -07:00
2013-06-03 20:20:29 +09:00
2013-05-10 14:37:17 +01:00
2013-07-03 14:35:40 -07:00
2013-05-01 16:36:22 +05:30
2013-07-03 16:07:42 -07:00
2013-04-30 17:04:02 -07:00
2013-07-06 14:09:38 -07:00
2013-07-06 14:09:38 -07:00
2013-07-03 13:25:24 +02:00
2013-07-03 16:07:41 -07:00
2013-05-07 18:38:27 -07:00
2013-04-29 18:28:40 -07:00
2013-05-28 15:03:04 +09:00
2013-06-27 16:53:30 +08:00
2013-05-01 17:31:42 -04:00
2013-06-19 16:49:39 -07:00
2013-06-09 18:15:00 +02:00
2013-06-06 12:41:57 -07:00
2013-06-17 16:38:57 -07:00
2013-06-19 20:30:32 -07:00
2013-05-12 14:16:22 +02:00
2013-04-30 17:04:00 -07:00
2013-07-09 13:33:36 -07:00
2013-06-19 14:16:47 +01:00
2013-04-29 18:28:41 -07:00
2013-06-29 12:57:13 +04:00
2013-05-09 20:14:25 -04:00
2013-06-19 23:32:07 -04:00
2013-04-29 18:28:13 -07:00
2013-07-09 10:33:21 -07:00
2013-06-10 13:45:49 -07:00
2013-04-30 10:09:06 +02:00
2013-05-06 13:07:33 +02:00
2013-07-04 10:29:23 -07:00
2013-07-03 16:07:32 -07:00
2013-06-03 14:09:14 -07:00
2013-04-29 13:54:36 -04:00
2013-05-08 11:51:05 -07:00
2013-06-03 17:03:18 +02:00
2013-06-05 12:00:27 -07:00
2013-06-13 17:51:04 -07:00
2013-06-25 16:44:56 -07:00
2013-06-19 16:49:39 -07:00
2013-07-03 14:55:13 -07:00
2013-06-12 00:25:23 -07:00
2013-06-12 00:25:23 -07:00
2013-06-26 12:13:18 -04:00
2013-05-31 13:02:52 +10:00
2013-05-02 12:10:19 +02:00
2013-04-29 15:54:37 -07:00
2013-05-01 08:12:58 -07:00
2013-06-17 16:38:57 -07:00
2013-06-25 11:48:24 +02:00
2013-06-06 10:23:58 +09:00
2013-06-24 14:02:41 +01:00
2013-07-01 08:12:41 -04:00
2013-06-12 23:02:35 -04:00
2013-06-12 23:02:35 -04:00
2013-07-02 15:53:53 -07:00
2013-05-13 09:45:01 -04:00
2013-04-29 15:42:02 -04:00
2013-07-04 11:40:58 -07:00
2013-04-30 17:04:06 -07:00
2013-05-16 07:55:07 -07:00
2013-04-30 17:04:02 -07:00
2013-07-09 18:24:39 -07:00
2013-07-03 13:21:40 -07:00
2013-07-03 16:07:43 -07:00
2013-06-06 14:05:23 -07:00
2013-05-05 10:58:06 -07:00
2013-05-31 17:31:52 -07:00
2013-07-09 10:33:30 -07:00
2013-05-31 00:48:22 -07:00
2013-06-12 16:29:47 -07:00
2013-07-03 16:07:26 -07:00
2013-06-01 22:24:07 +02:00
2013-06-01 21:37:09 +02:00
2013-07-10 18:11:34 -07:00
2013-07-09 10:33:23 -07:00
2013-07-03 16:07:32 -07:00
2013-07-09 10:33:22 -07:00
2013-07-03 16:08:05 -07:00
2013-07-02 15:38:19 +09:30
2013-05-28 11:31:16 -06:00
2013-06-26 12:10:56 +02:00
2013-06-26 12:10:56 +02:00
2013-05-30 17:54:03 -07:00
2013-07-03 16:08:05 -07:00
2013-06-04 15:17:38 -07:00
2013-05-27 22:50:59 -07:00
2013-07-03 14:55:13 -07:00
2013-05-23 11:58:55 +02:00
2013-05-23 14:22:30 +02:00
2013-06-27 22:44:16 -07:00
2013-05-27 23:18:50 -07:00
2013-06-08 16:20:14 -04:00
2013-06-08 16:20:16 -04:00
2013-07-09 17:17:07 -04:00
2013-06-28 16:29:51 -04:00
2013-04-29 15:54:36 -07:00
2013-05-04 14:47:26 -04:00
2013-05-08 09:55:05 -04:00
2013-05-19 20:29:55 +00:00
2013-06-12 12:37:40 +01:00
2013-06-12 07:49:19 +05:30
2013-05-19 20:30:10 +00:00
2013-06-12 12:37:30 +01:00
2013-05-07 11:22:14 -07:00
2013-06-11 11:41:51 -05:00
2013-07-03 16:07:32 -07:00
2013-04-29 15:54:28 -07:00
2013-07-03 16:07:31 -07:00
2013-06-26 15:55:52 -06:00
2013-05-17 14:12:06 -06:00
2013-06-26 21:10:05 +02:00
2013-06-16 16:12:26 -07:00
2013-07-02 16:17:25 -07:00
2013-05-31 17:19:05 -07:00
2013-05-07 20:16:25 -07:00
2013-07-03 16:08:03 -07:00
2013-07-04 15:51:45 -07:00
2013-06-03 21:49:52 +02:00
2013-07-03 16:16:20 +02:00
2013-06-28 18:20:52 -07:00
2013-06-19 12:55:10 +02:00
2013-05-22 01:34:24 +02:00
2013-05-01 17:29:47 -04:00
2013-05-01 17:29:39 -04:00
2013-07-01 18:10:48 +10:00
2013-07-09 10:33:26 -07:00
2013-06-28 23:15:06 +02:00
2013-06-21 11:32:51 +02:00
2013-04-29 15:54:28 -07:00
2013-05-07 18:38:27 -07:00
2013-06-02 20:53:59 -07:00
2013-05-28 22:47:13 -04:00
2013-06-10 13:45:52 -07:00
2013-06-10 13:45:52 -07:00
2013-06-10 13:45:52 -07:00
2013-07-09 10:33:29 -07:00
2013-06-30 12:40:03 +01:00
2013-04-30 17:04:09 -07:00
2013-04-29 19:14:20 -07:00
2013-06-28 12:02:15 +10:00
2013-05-24 16:22:50 -07:00
2013-07-03 16:08:05 -07:00
2013-07-03 16:08:05 -07:00
2013-04-29 18:28:22 -07:00
2013-07-09 10:33:30 -07:00
2013-06-12 14:02:13 -07:00
2013-07-10 18:11:34 -07:00
2013-06-17 16:38:57 -07:00
2013-07-09 12:09:43 -07:00
2013-07-09 10:33:28 -07:00
2013-07-08 13:36:41 +04:00
2013-05-20 11:47:21 -07:00
2013-06-17 18:09:53 +09:00
2013-07-05 11:40:59 +05:30
2013-07-05 11:41:00 +05:30
2013-05-01 17:51:54 -07:00
2013-07-03 14:55:13 -07:00
2013-05-06 09:24:16 +03:00
2013-07-03 16:07:22 -07:00
2013-04-29 13:21:30 -04:00
2013-06-06 11:52:14 -07:00
2013-06-19 23:34:50 +02:00
2013-06-19 12:58:42 +02:00
2013-06-20 19:02:45 +04:00
2013-06-10 13:45:25 -07:00
2013-07-04 14:34:17 -07:00
2013-04-30 17:04:03 -07:00
2013-04-30 15:50:12 +05:30
2013-06-21 00:35:12 +02:00
2013-07-03 16:07:32 -07:00
2013-06-12 16:29:46 -07:00
2013-06-12 16:29:44 -07:00
2013-05-19 23:51:17 -07:00
2013-05-09 09:40:49 -07:00
2013-05-14 20:54:06 +02:00
2013-04-25 21:01:45 +08:00
2013-05-21 12:25:02 -05:00
2013-06-20 22:24:32 -07:00
2013-06-17 12:55:11 -07:00
2013-06-17 12:55:11 -07:00
2013-05-20 10:24:22 +09:30
2013-06-05 16:48:40 -07:00
2013-07-09 10:33:29 -07:00
2013-07-09 10:47:53 +09:30
2013-07-09 18:24:39 -07:00
2013-07-09 10:33:21 -07:00
2013-04-29 15:54:38 -07:00
2013-04-29 15:54:37 -07:00
2013-05-27 10:57:53 +09:00
2013-05-31 11:31:50 +02:00
2013-07-02 09:52:47 -07:00
2013-07-03 16:07:41 -07:00
2013-07-09 10:33:22 -07:00
2013-07-10 18:11:34 -07:00
36805aaea5