Please sign in to comment.
Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block
Merge block/IO core bits from Jens Axboe: "This is a bit bigger on the core side than usual, but that is purely because we decided to hold off on parts of Tejun's submission on 3.4 to give it a bit more time to simmer. As a consequence, it's seen a long cycle in for-next. It contains: - Bug fix from Dan, wrong locking type. - Relax splice gifting restriction from Eric. - A ton of updates from Tejun, primarily for blkcg. This improves the code a lot, making the API nicer and cleaner, and also includes fixes for how we handle and tie policies and re-activate on switches. The changes also include generic bug fixes. - A simple fix from Vivek, along with a fix for doing proper delayed allocation of the blkcg stats." Fix up annoying conflict just due to different merge resolution in Documentation/feature-removal-schedule.txt * 'for-3.5/core' of git://git.kernel.dk/linux-block: (92 commits) blkcg: tg_stats_alloc_lock is an irq lock vmsplice: relax alignement requirements for SPLICE_F_GIFT blkcg: use radix tree to index blkgs from blkcg blkcg: fix blkcg->css ref leak in __blkg_lookup_create() block: fix elvpriv allocation failure handling block: collapse blk_alloc_request() into get_request() blkcg: collapse blkcg_policy_ops into blkcg_policy blkcg: embed struct blkg_policy_data in policy specific data blkcg: mass rename of blkcg API blkcg: style cleanups for blk-cgroup.h blkcg: remove blkio_group->path blkcg: blkg_rwstat_read() was missing inline blkcg: shoot down blkgs if all policies are deactivated blkcg: drop stuff unused after per-queue policy activation update blkcg: implement per-queue policy activation blkcg: add request_queue->root_blkg blkcg: make request_queue bypassing on allocation blkcg: make sure blkg_lookup() returns %NULL if @q is bypassing blkcg: make blkg_conf_prep() take @pol and return with queue lock held blkcg: remove static policy ID enums ...
- Loading branch information...
Showing with 2,446 additions and 2,952 deletions.
- +0 −4 block/Kconfig.iosched
- +669 −1,431 block/blk-cgroup.c
- +334 −313 block/blk-cgroup.h
- +188 −93 block/blk-core.c
- +35 −91 block/blk-ioc.c
- +3 −3 block/blk-sysfs.c
- +325 −372 block/blk-throttle.c
- +13 −19 block/blk.h
- +685 −387 block/cfq-iosched.c
- +0 −115 block/cfq.h
- +5 −3 block/deadline-iosched.c
- +48 −73 block/elevator.c
- +5 −3 block/noop-iosched.c
- +61 −0 fs/bio.c
- +1 −1 fs/ioprio.c
- +2 −2 fs/splice.c
- +8 −0 include/linux/bio.h
- +10 −0 include/linux/blk_types.h
- +19 −1 include/linux/blkdev.h
- +5 −3 include/linux/elevator.h
- +22 −17 include/linux/iocontext.h
- +5 −17 include/linux/ioprio.h
- +1 −1 init/Kconfig
- +2 −3 kernel/fork.c
Oops, something went wrong.