git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
message
/
i2o
/
i2o_block.h
diff --git
a/drivers/message/i2o/i2o_block.h
b/drivers/message/i2o/i2o_block.h
index
ddd9a15
..
67f921b
100644
(file)
--- a/
drivers/message/i2o/i2o_block.h
+++ b/
drivers/message/i2o/i2o_block.h
@@
-56,43
+56,47
@@
#define I2O_BLOCK_RETRY_TIME HZ/4
#define I2O_BLOCK_MAX_OPEN_REQUESTS 50
#define I2O_BLOCK_RETRY_TIME HZ/4
#define I2O_BLOCK_MAX_OPEN_REQUESTS 50
+/* request queue sizes */
+#define I2O_BLOCK_REQ_MEMPOOL_SIZE 32
+
+#define KERNEL_SECTOR_SHIFT 9
+#define KERNEL_SECTOR_SIZE (1 << KERNEL_SECTOR_SHIFT)
+
/* I2O Block OSM mempool struct */
struct i2o_block_mempool {
/* I2O Block OSM mempool struct */
struct i2o_block_mempool {
-
kmem_cache_t
*slab;
- mempool_t
*pool;
+
struct kmem_cache
*slab;
+ mempool_t *pool;
};
/* I2O Block device descriptor */
struct i2o_block_device {
struct i2o_device *i2o_dev; /* pointer to I2O device */
struct gendisk *gd;
};
/* I2O Block device descriptor */
struct i2o_block_device {
struct i2o_device *i2o_dev; /* pointer to I2O device */
struct gendisk *gd;
- spinlock_t lock;
/* queue lock */
+ spinlock_t lock; /* queue lock */
struct list_head open_queue; /* list of transfered, but unfinished
requests */
unsigned int open_queue_depth; /* number of requests in the queue */
struct list_head open_queue; /* list of transfered, but unfinished
requests */
unsigned int open_queue_depth; /* number of requests in the queue */
- int rcache;
/* read cache flags */
- int wcache;
/* write cache flags */
+ int rcache; /* read cache flags */
+ int wcache; /* write cache flags */
int flags;
int flags;
-
int power;
/* power state */
- int media_change_flag;
/* media changed flag */
+
u16 power;
/* power state */
+ int media_change_flag; /* media changed flag */
};
/* I2O Block device request */
};
/* I2O Block device request */
-struct i2o_block_request
-{
+struct i2o_block_request {
struct list_head queue;
struct list_head queue;
- struct request *req;
/* corresponding request */
+ struct request *req; /* corresponding request */
struct i2o_block_device *i2o_blk_dev; /* I2O block device */
struct i2o_block_device *i2o_blk_dev; /* I2O block device */
-
int sg_dma_direction; /* direction of DMA buffer read/write
*/
- int sg_nents;
/* number of SG elements */
- struct scatterlist sg_table[I2O_MAX_
SEGMENTS];
/* SG table */
+
struct device *dev; /* device used for DMA
*/
+ int sg_nents; /* number of SG elements */
+ struct scatterlist sg_table[I2O_MAX_
PHYS_SEGMENTS];
/* SG table */
};
/* I2O Block device delayed request */
};
/* I2O Block device delayed request */
-struct i2o_block_delayed_request
-{
- struct work_struct work;
+struct i2o_block_delayed_request {
+ struct delayed_work work;
struct request_queue *queue;
};
struct request_queue *queue;
};