diff options
author | Asias He <asias@redhat.com> | 2012-06-14 09:04:07 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-06-15 08:46:23 +0200 |
commit | 76aaa5101fffaef12b45b4c01ed0d0528f23dedf (patch) | |
tree | f50fb22da33901b7acd7d63350b781238fd242c2 /block/blk-timeout.c | |
parent | 5e5cfac0c622d42eff4fa308e91b3c9c1884b4f0 (diff) | |
download | kernel_goldelico_gta04-76aaa5101fffaef12b45b4c01ed0d0528f23dedf.zip kernel_goldelico_gta04-76aaa5101fffaef12b45b4c01ed0d0528f23dedf.tar.gz kernel_goldelico_gta04-76aaa5101fffaef12b45b4c01ed0d0528f23dedf.tar.bz2 |
block: Drop dead function blk_abort_queue()
This function was only used by btrfs code in btrfs_abort_devices()
(seems in a wrong way).
It was removed in commit d07eb9117050c9ed3f78296ebcc06128b52693be,
So, Let's remove the dead code to avoid any confusion.
Changes in v2: update commit log, btrfs_abort_devices() was removed
already.
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-kernel@vger.kernel.org
Cc: Chris Mason <chris.mason@oracle.com>
Cc: linux-btrfs@vger.kernel.org
Cc: David Sterba <dave@jikos.cz>
Signed-off-by: Asias He <asias@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-timeout.c')
-rw-r--r-- | block/blk-timeout.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 7803548..6e4744c 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -197,44 +197,3 @@ void blk_add_timer(struct request *req) mod_timer(&q->timeout, expiry); } -/** - * blk_abort_queue -- Abort all request on given queue - * @queue: pointer to queue - * - */ -void blk_abort_queue(struct request_queue *q) -{ - unsigned long flags; - struct request *rq, *tmp; - LIST_HEAD(list); - - /* - * Not a request based block device, nothing to abort - */ - if (!q->request_fn) - return; - - spin_lock_irqsave(q->queue_lock, flags); - - elv_abort_queue(q); - - /* - * Splice entries to local list, to avoid deadlocking if entries - * get readded to the timeout list by error handling - */ - list_splice_init(&q->timeout_list, &list); - - list_for_each_entry_safe(rq, tmp, &list, timeout_list) - blk_abort_request(rq); - - /* - * Occasionally, blk_abort_request() will return without - * deleting the element from the list. Make sure we add those back - * instead of leaving them on the local stack list. - */ - list_splice(&list, &q->timeout_list); - - spin_unlock_irqrestore(q->queue_lock, flags); - -} -EXPORT_SYMBOL_GPL(blk_abort_queue); |