diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-07-18 09:29:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-07-18 09:29:39 -0700 |
| commit | 86df0e66c0ea429cc38d966be1bfcd856941e05c (patch) | |
| tree | 1f6d70a8440bcfa3298e2a5d8bf2054b740d8e32 /include/linux/blkdev.h | |
| parent | 911e72b5a6b5492938e6763798ca120353ea9355 (diff) | |
| parent | 1d02c2c0dfe098493f1359da83f1f2ba551f40a6 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 2e7f92aa1dc2..d951995038e5 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -44,9 +44,9 @@ struct as_io_context { unsigned long ttime_samples; unsigned long ttime_mean; /* Layout pattern */ - long seek_samples; + unsigned int seek_samples; sector_t last_request_pos; - sector_t seek_total; + u64 seek_total; sector_t seek_mean; }; @@ -491,6 +491,7 @@ extern void __blk_attempt_remerge(request_queue_t *, struct request *); extern struct request *blk_get_request(request_queue_t *, int, int); extern void blk_put_request(struct request *); extern void blk_insert_request(request_queue_t *, struct request *, int, void *); +extern void blk_requeue_request(request_queue_t *, struct request *); extern void blk_plug_device(request_queue_t *); extern int blk_remove_plug(request_queue_t *); extern void blk_recount_segments(request_queue_t *, struct bio *); |