diff options
| author | Jens Axboe <axboe@nelson.home.kernel.dk> | 2007-04-30 03:09:27 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2007-04-30 03:09:27 -0400 |
| commit | 07e44708059010aa26c6a4c8ee6ff11743d04d4e (patch) | |
| tree | 06a249ed6100af3d89623237d2af5430d5fc0525 /include/linux | |
| parent | 2a12dcd71a5e0667b33f7b47bcac95c71d551840 (diff) | |
| parent | 597bc485d6906359ad667fc8ead5e5f0ede03a0a (diff) | |
Merge branch 'cfq' into for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 83dcd8c0e974..a686eabe22d6 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -116,6 +116,7 @@ struct io_context { | |||
| 116 | 116 | ||
| 117 | struct as_io_context *aic; | 117 | struct as_io_context *aic; |
| 118 | struct rb_root cic_root; | 118 | struct rb_root cic_root; |
| 119 | void *ioc_data; | ||
| 119 | }; | 120 | }; |
| 120 | 121 | ||
| 121 | void put_io_context(struct io_context *ioc); | 122 | void put_io_context(struct io_context *ioc); |