diff options
Diffstat (limited to 'drivers/message/i2o/i2o_block.h')
-rw-r--r-- | drivers/message/i2o/i2o_block.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/drivers/message/i2o/i2o_block.h b/drivers/message/i2o/i2o_block.h index e45cc40ce384..4fdaa5bda412 100644 --- a/drivers/message/i2o/i2o_block.h +++ b/drivers/message/i2o/i2o_block.h | |||
@@ -64,40 +64,38 @@ | |||
64 | 64 | ||
65 | /* I2O Block OSM mempool struct */ | 65 | /* I2O Block OSM mempool struct */ |
66 | struct i2o_block_mempool { | 66 | struct i2o_block_mempool { |
67 | kmem_cache_t *slab; | 67 | kmem_cache_t *slab; |
68 | mempool_t *pool; | 68 | mempool_t *pool; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | /* I2O Block device descriptor */ | 71 | /* I2O Block device descriptor */ |
72 | struct i2o_block_device { | 72 | struct i2o_block_device { |
73 | struct i2o_device *i2o_dev; /* pointer to I2O device */ | 73 | struct i2o_device *i2o_dev; /* pointer to I2O device */ |
74 | struct gendisk *gd; | 74 | struct gendisk *gd; |
75 | spinlock_t lock; /* queue lock */ | 75 | spinlock_t lock; /* queue lock */ |
76 | struct list_head open_queue; /* list of transfered, but unfinished | 76 | struct list_head open_queue; /* list of transfered, but unfinished |
77 | requests */ | 77 | requests */ |
78 | unsigned int open_queue_depth; /* number of requests in the queue */ | 78 | unsigned int open_queue_depth; /* number of requests in the queue */ |
79 | 79 | ||
80 | int rcache; /* read cache flags */ | 80 | int rcache; /* read cache flags */ |
81 | int wcache; /* write cache flags */ | 81 | int wcache; /* write cache flags */ |
82 | int flags; | 82 | int flags; |
83 | u16 power; /* power state */ | 83 | u16 power; /* power state */ |
84 | int media_change_flag; /* media changed flag */ | 84 | int media_change_flag; /* media changed flag */ |
85 | }; | 85 | }; |
86 | 86 | ||
87 | /* I2O Block device request */ | 87 | /* I2O Block device request */ |
88 | struct i2o_block_request | 88 | struct i2o_block_request { |
89 | { | ||
90 | struct list_head queue; | 89 | struct list_head queue; |
91 | struct request *req; /* corresponding request */ | 90 | struct request *req; /* corresponding request */ |
92 | struct i2o_block_device *i2o_blk_dev; /* I2O block device */ | 91 | struct i2o_block_device *i2o_blk_dev; /* I2O block device */ |
93 | struct device *dev; /* device used for DMA */ | 92 | struct device *dev; /* device used for DMA */ |
94 | int sg_nents; /* number of SG elements */ | 93 | int sg_nents; /* number of SG elements */ |
95 | struct scatterlist sg_table[I2O_MAX_PHYS_SEGMENTS]; /* SG table */ | 94 | struct scatterlist sg_table[I2O_MAX_PHYS_SEGMENTS]; /* SG table */ |
96 | }; | 95 | }; |
97 | 96 | ||
98 | /* I2O Block device delayed request */ | 97 | /* I2O Block device delayed request */ |
99 | struct i2o_block_delayed_request | 98 | struct i2o_block_delayed_request { |
100 | { | ||
101 | struct work_struct work; | 99 | struct work_struct work; |
102 | struct request_queue *queue; | 100 | struct request_queue *queue; |
103 | }; | 101 | }; |