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 ...
Showing the changes to kernel (1 of 24 files). Show all
Unified · Split
| @@ -976,9 +976,8 @@ static int copy_io(unsigned long clone_flags, struct task_struct *tsk) · 975 unmodified lines | |||
| 976 | * Share io context with parent, if CLONE_IO is set | 976 | * Share io context with parent, if CLONE_IO is set |
| 977 | */ | 977 | */ |
| 978 | if (clone_flags & CLONE_IO) { | 978 | if (clone_flags & CLONE_IO) { |
| 979 | tsk->io_context = ioc_task_link(ioc); | 979 | ioc_task_link(ioc); |
| 980 | if (unlikely(!tsk->io_context)) | 980 | tsk->io_context = ioc; |
| 981 | return -ENOMEM; | ||
| 982 | } else if (ioprio_valid(ioc->ioprio)) { | 981 | } else if (ioprio_valid(ioc->ioprio)) { |
| 983 | new_ioc = get_task_io_context(tsk, GFP_KERNEL, NUMA_NO_NODE); | 982 | new_ioc = get_task_io_context(tsk, GFP_KERNEL, NUMA_NO_NODE); |
| 984 | if (unlikely(!new_ioc)) | 983 | if (unlikely(!new_ioc)) |