diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 02:53:01 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 02:53:01 -0400 |
| commit | 48a7afe314bfc4d7f50e1608632f503dbba7e013 (patch) | |
| tree | 4a80e6b96321a71affd1bacea817de93be08894b /include/linux/blkdev.h | |
| parent | fb8f7ba077b5c665432082ab205bcd2cb01f6a3c (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/blkdev.h')
| -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); |