diff options
| author | Jens Axboe <axboe@nelson.home.kernel.dk> | 2007-04-30 11:09:27 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2007-04-30 11:09:27 +0400 |
| commit | 07e44708059010aa26c6a4c8ee6ff11743d04d4e (patch) | |
| tree | 06a249ed6100af3d89623237d2af5430d5fc0525 /block/ll_rw_blk.c | |
| parent | 2a12dcd71a5e0667b33f7b47bcac95c71d551840 (diff) | |
| parent | 597bc485d6906359ad667fc8ead5e5f0ede03a0a (diff) | |
| download | linux-07e44708059010aa26c6a4c8ee6ff11743d04d4e.tar.xz | |
Merge branch 'cfq' into for-linus
Diffstat (limited to 'block/ll_rw_blk.c')
| -rw-r--r-- | block/ll_rw_blk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 3de06953ac33..123003a90477 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -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; |