Merge branch 'cfq' into for-linus

This commit is contained in:
Jens Axboe
2007-04-30 09:09:27 +02:00
3 changed files with 455 additions and 432 deletions
+453 -432
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -3741,6 +3741,7 @@ static struct io_context *current_io_context(gfp_t gfp_flags, int node)
ret->nr_batch_requests = 0; /* because this is 0 */
ret->aic = NULL;
ret->cic_root.rb_node = NULL;
ret->ioc_data = NULL;
/* make sure set_task_ioprio() sees the settings above */
smp_wmb();
tsk->io_context = ret;