diff options
author | James Bottomley <James.Bottomley@suse.de> | 2010-07-01 06:49:17 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 12:23:47 -0400 |
commit | 28018c242a4ec7017bbbf81d2d3952f820a27118 (patch) | |
tree | 03732bef20d0e4dad30d81d9b9ad9ffcf5a2e41c /include/linux | |
parent | e597cd09f711b28b8466ebdc2f12e55b44fa81e4 (diff) |
block: implement an unprep function corresponding directly to prep
Reviewed-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 204fbe22354d..6bba04c7ec48 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -200,6 +200,7 @@ struct request_pm_state | |||
200 | typedef void (request_fn_proc) (struct request_queue *q); | 200 | typedef void (request_fn_proc) (struct request_queue *q); |
201 | typedef int (make_request_fn) (struct request_queue *q, struct bio *bio); | 201 | typedef int (make_request_fn) (struct request_queue *q, struct bio *bio); |
202 | typedef int (prep_rq_fn) (struct request_queue *, struct request *); | 202 | typedef int (prep_rq_fn) (struct request_queue *, struct request *); |
203 | typedef void (unprep_rq_fn) (struct request_queue *, struct request *); | ||
203 | typedef void (unplug_fn) (struct request_queue *); | 204 | typedef void (unplug_fn) (struct request_queue *); |
204 | 205 | ||
205 | struct bio_vec; | 206 | struct bio_vec; |
@@ -282,6 +283,7 @@ struct request_queue | |||
282 | request_fn_proc *request_fn; | 283 | request_fn_proc *request_fn; |
283 | make_request_fn *make_request_fn; | 284 | make_request_fn *make_request_fn; |
284 | prep_rq_fn *prep_rq_fn; | 285 | prep_rq_fn *prep_rq_fn; |
286 | unprep_rq_fn *unprep_rq_fn; | ||
285 | unplug_fn *unplug_fn; | 287 | unplug_fn *unplug_fn; |
286 | merge_bvec_fn *merge_bvec_fn; | 288 | merge_bvec_fn *merge_bvec_fn; |
287 | prepare_flush_fn *prepare_flush_fn; | 289 | prepare_flush_fn *prepare_flush_fn; |
@@ -841,6 +843,7 @@ extern void blk_complete_request(struct request *); | |||
841 | extern void __blk_complete_request(struct request *); | 843 | extern void __blk_complete_request(struct request *); |
842 | extern void blk_abort_request(struct request *); | 844 | extern void blk_abort_request(struct request *); |
843 | extern void blk_abort_queue(struct request_queue *); | 845 | extern void blk_abort_queue(struct request_queue *); |
846 | extern void blk_unprep_request(struct request *); | ||
844 | 847 | ||
845 | /* | 848 | /* |
846 | * Access functions for manipulating queue properties | 849 | * Access functions for manipulating queue properties |
@@ -885,6 +888,7 @@ extern int blk_queue_dma_drain(struct request_queue *q, | |||
885 | extern void blk_queue_lld_busy(struct request_queue *q, lld_busy_fn *fn); | 888 | extern void blk_queue_lld_busy(struct request_queue *q, lld_busy_fn *fn); |
886 | extern void blk_queue_segment_boundary(struct request_queue *, unsigned long); | 889 | extern void blk_queue_segment_boundary(struct request_queue *, unsigned long); |
887 | extern void blk_queue_prep_rq(struct request_queue *, prep_rq_fn *pfn); | 890 | extern void blk_queue_prep_rq(struct request_queue *, prep_rq_fn *pfn); |
891 | extern void blk_queue_unprep_rq(struct request_queue *, unprep_rq_fn *ufn); | ||
888 | extern void blk_queue_merge_bvec(struct request_queue *, merge_bvec_fn *); | 892 | extern void blk_queue_merge_bvec(struct request_queue *, merge_bvec_fn *); |
889 | extern void blk_queue_dma_alignment(struct request_queue *, int); | 893 | extern void blk_queue_dma_alignment(struct request_queue *, int); |
890 | extern void blk_queue_update_dma_alignment(struct request_queue *, int); | 894 | extern void blk_queue_update_dma_alignment(struct request_queue *, int); |