diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2011-04-18 03:54:05 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-04-18 03:54:05 -0400 |
commit | b4cb290e0a7d19235bd075c2ad4d60dbab0bac15 (patch) | |
tree | 2674fc5e3d0ee76e8b8205ab771fe7bbed173a88 /block | |
parent | 048c9374a749a27f16493cea033fa4a8ff492356 (diff) |
Revert "block: add callback function for unplug notification"
MD can't use this since it really requires us to be able to
keep more than a single piece of state for the unplug. Commit
048c9374 added the required support for MD, so get rid of this
now unused code.
This reverts commit f75664570d8b75469cc468f23c2b27220984983b.
Conflicts:
block/blk-core.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-core.c | 3 | ||||
-rw-r--r-- | block/blk-settings.c | 16 |
2 files changed, 0 insertions, 19 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 77edf0512338..09b262811fff 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -2674,9 +2674,6 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth, | |||
2674 | { | 2674 | { |
2675 | trace_block_unplug(q, depth, !from_schedule); | 2675 | trace_block_unplug(q, depth, !from_schedule); |
2676 | __blk_run_queue(q, from_schedule); | 2676 | __blk_run_queue(q, from_schedule); |
2677 | |||
2678 | if (q->unplugged_fn) | ||
2679 | q->unplugged_fn(q); | ||
2680 | } | 2677 | } |
2681 | 2678 | ||
2682 | static void flush_plug_callbacks(struct blk_plug *plug) | 2679 | static void flush_plug_callbacks(struct blk_plug *plug) |
diff --git a/block/blk-settings.c b/block/blk-settings.c index eb949045bb12..1fa769293597 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
@@ -790,22 +790,6 @@ 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 | |||
809 | static int __init blk_settings_init(void) | 793 | static int __init blk_settings_init(void) |
810 | { | 794 | { |
811 | blk_max_low_pfn = max_low_pfn - 1; | 795 | blk_max_low_pfn = max_low_pfn - 1; |