diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-04-12 04:17:31 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-04-12 04:17:31 -0400 |
| commit | f75664570d8b75469cc468f23c2b27220984983b (patch) | |
| tree | 48f1e9b8576892cab65361e39b874e0e07d3b32a | |
| parent | 188112722cce083c8f1a7d0d84f55c2cd885920c (diff) | |
block: add callback function for unplug notification
MD would like to know when a queue is unplugged, so it can flush
it's bitmap writes. Add such a callback.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
| -rw-r--r-- | block/blk-core.c | 3 | ||||
| -rw-r--r-- | block/blk-settings.c | 16 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 3 |
3 files changed, 22 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 0c0ea10e61ea..76850fc9cf23 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -2672,6 +2672,9 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth) | |||
| 2672 | { | 2672 | { |
| 2673 | trace_block_unplug_io(q, depth); | 2673 | trace_block_unplug_io(q, depth); |
| 2674 | __blk_run_queue(q, false); | 2674 | __blk_run_queue(q, false); |
| 2675 | |||
| 2676 | if (q->unplugged_fn) | ||
| 2677 | q->unplugged_fn(q); | ||
| 2675 | } | 2678 | } |
| 2676 | 2679 | ||
| 2677 | static void flush_plug_list(struct blk_plug *plug) | 2680 | static void flush_plug_list(struct blk_plug *plug) |
diff --git a/block/blk-settings.c b/block/blk-settings.c index 1fa769293597..eb949045bb12 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
| @@ -790,6 +790,22 @@ void blk_queue_flush(struct request_queue *q, unsigned int flush) | |||
| 790 | } | 790 | } |
| 791 | EXPORT_SYMBOL_GPL(blk_queue_flush); | 791 | EXPORT_SYMBOL_GPL(blk_queue_flush); |
| 792 | 792 | ||
| 793 | /** | ||
| 794 | * blk_queue_unplugged - register a callback for an unplug event | ||
| 795 | * @q: the request queue for the device | ||
| 796 | * @fn: the function to call | ||
| 797 | * | ||
| 798 | * Some stacked drivers may need to know when IO is dispatched on an | ||
| 799 | * unplug event. By registrering a callback here, they will be notified | ||
| 800 | * when someone flushes their on-stack queue plug. The function will be | ||
| 801 | * called with the queue lock held. | ||
| 802 | */ | ||
| 803 | void blk_queue_unplugged(struct request_queue *q, unplugged_fn *fn) | ||
| 804 | { | ||
| 805 | q->unplugged_fn = fn; | ||
| 806 | } | ||
| 807 | EXPORT_SYMBOL(blk_queue_unplugged); | ||
| 808 | |||
| 793 | static int __init blk_settings_init(void) | 809 | static int __init blk_settings_init(void) |
| 794 | { | 810 | { |
| 795 | blk_max_low_pfn = max_low_pfn - 1; | 811 | blk_max_low_pfn = max_low_pfn - 1; |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 32176cc8e715..c07ffafac5d4 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -196,6 +196,7 @@ typedef void (request_fn_proc) (struct request_queue *q); | |||
| 196 | typedef int (make_request_fn) (struct request_queue *q, struct bio *bio); | 196 | typedef int (make_request_fn) (struct request_queue *q, struct bio *bio); |
| 197 | typedef int (prep_rq_fn) (struct request_queue *, struct request *); | 197 | typedef int (prep_rq_fn) (struct request_queue *, struct request *); |
| 198 | typedef void (unprep_rq_fn) (struct request_queue *, struct request *); | 198 | typedef void (unprep_rq_fn) (struct request_queue *, struct request *); |
| 199 | typedef void (unplugged_fn) (struct request_queue *); | ||
| 199 | 200 | ||
| 200 | struct bio_vec; | 201 | struct bio_vec; |
| 201 | struct bvec_merge_data { | 202 | struct bvec_merge_data { |
| @@ -283,6 +284,7 @@ struct request_queue | |||
| 283 | rq_timed_out_fn *rq_timed_out_fn; | 284 | rq_timed_out_fn *rq_timed_out_fn; |
| 284 | dma_drain_needed_fn *dma_drain_needed; | 285 | dma_drain_needed_fn *dma_drain_needed; |
| 285 | lld_busy_fn *lld_busy_fn; | 286 | lld_busy_fn *lld_busy_fn; |
| 287 | unplugged_fn *unplugged_fn; | ||
| 286 | 288 | ||
| 287 | /* | 289 | /* |
| 288 | * Dispatch queue sorting | 290 | * Dispatch queue sorting |
| @@ -841,6 +843,7 @@ extern void blk_queue_dma_alignment(struct request_queue *, int); | |||
| 841 | extern void blk_queue_update_dma_alignment(struct request_queue *, int); | 843 | extern void blk_queue_update_dma_alignment(struct request_queue *, int); |
| 842 | extern void blk_queue_softirq_done(struct request_queue *, softirq_done_fn *); | 844 | extern void blk_queue_softirq_done(struct request_queue *, softirq_done_fn *); |
| 843 | extern void blk_queue_rq_timed_out(struct request_queue *, rq_timed_out_fn *); | 845 | extern void blk_queue_rq_timed_out(struct request_queue *, rq_timed_out_fn *); |
| 846 | extern void blk_queue_unplugged(struct request_queue *, unplugged_fn *); | ||
| 844 | extern void blk_queue_rq_timeout(struct request_queue *, unsigned int); | 847 | extern void blk_queue_rq_timeout(struct request_queue *, unsigned int); |
| 845 | extern void blk_queue_flush(struct request_queue *q, unsigned int flush); | 848 | extern void blk_queue_flush(struct request_queue *q, unsigned int flush); |
| 846 | extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); | 849 | extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); |
