summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2003-05-26 22:22:35 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2003-05-26 22:22:35 -0700
commitfc2dcf95e9148b68974cbe071a65a664104af937 (patch)
tree99623de3fab4f38a5e8ff26cd3c1bc2f7b71d3e3 /include/linux
parentb16d3cbc19dc7b72a0e97d66798be7dcf506fc30 (diff)
parentb88ac404cfa31d66f4c888af5e9362d4a244021a (diff)
Merge bk://linus@bkbits.net/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blkdev.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index aa38c5f33c21..03691501d68f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -179,7 +179,8 @@ struct blk_queue_tag {
unsigned long *tag_map; /* bit map of free/busy tags */
struct list_head busy_list; /* fifo list of busy tags */
int busy; /* current depth */
- int max_depth;
+ int max_depth; /* what we will send to device */
+ int real_max_depth; /* what the array can hold */
};
struct request_queue
@@ -452,6 +453,7 @@ extern struct request *blk_queue_find_tag(request_queue_t *, int);
extern void blk_queue_end_tag(request_queue_t *, struct request *);
extern int blk_queue_init_tags(request_queue_t *, int);
extern void blk_queue_free_tags(request_queue_t *);
+extern int blk_queue_resize_tags(request_queue_t *, int);
extern void blk_queue_invalidate_tags(request_queue_t *);
extern void blk_congestion_wait(int rw, long timeout);