diff options
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r-- | include/linux/blkdev.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index a33a31e71bbc..a18500d196e1 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -184,6 +184,7 @@ struct request { | |||
184 | void *sense; | 184 | void *sense; |
185 | 185 | ||
186 | unsigned int timeout; | 186 | unsigned int timeout; |
187 | int retries; | ||
187 | 188 | ||
188 | /* | 189 | /* |
189 | * For Power Management requests | 190 | * For Power Management requests |
@@ -558,6 +559,7 @@ extern void blk_unregister_queue(struct gendisk *disk); | |||
558 | extern void register_disk(struct gendisk *dev); | 559 | extern void register_disk(struct gendisk *dev); |
559 | extern void generic_make_request(struct bio *bio); | 560 | extern void generic_make_request(struct bio *bio); |
560 | extern void blk_put_request(struct request *); | 561 | extern void blk_put_request(struct request *); |
562 | extern void __blk_put_request(request_queue_t *, struct request *); | ||
561 | extern void blk_end_sync_rq(struct request *rq); | 563 | extern void blk_end_sync_rq(struct request *rq); |
562 | extern void blk_attempt_remerge(request_queue_t *, struct request *); | 564 | extern void blk_attempt_remerge(request_queue_t *, struct request *); |
563 | extern struct request *blk_get_request(request_queue_t *, int, gfp_t); | 565 | extern struct request *blk_get_request(request_queue_t *, int, gfp_t); |
@@ -579,6 +581,10 @@ extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned | |||
579 | extern int blk_rq_map_user_iov(request_queue_t *, struct request *, struct sg_iovec *, int); | 581 | extern int blk_rq_map_user_iov(request_queue_t *, struct request *, struct sg_iovec *, int); |
580 | extern int blk_execute_rq(request_queue_t *, struct gendisk *, | 582 | extern int blk_execute_rq(request_queue_t *, struct gendisk *, |
581 | struct request *, int); | 583 | struct request *, int); |
584 | extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *, | ||
585 | struct request *, int, | ||
586 | void (*done)(struct request *)); | ||
587 | |||
582 | static inline request_queue_t *bdev_get_queue(struct block_device *bdev) | 588 | static inline request_queue_t *bdev_get_queue(struct block_device *bdev) |
583 | { | 589 | { |
584 | return bdev->bd_disk->queue; | 590 | return bdev->bd_disk->queue; |
@@ -696,7 +702,8 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *); | |||
696 | 702 | ||
697 | #define MAX_PHYS_SEGMENTS 128 | 703 | #define MAX_PHYS_SEGMENTS 128 |
698 | #define MAX_HW_SEGMENTS 128 | 704 | #define MAX_HW_SEGMENTS 128 |
699 | #define MAX_SECTORS 255 | 705 | #define SAFE_MAX_SECTORS 255 |
706 | #define BLK_DEF_MAX_SECTORS 1024 | ||
700 | 707 | ||
701 | #define MAX_SEGMENT_SIZE 65536 | 708 | #define MAX_SEGMENT_SIZE 65536 |
702 | 709 | ||