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 d07eb91170
,
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>
This commit is contained in:
parent
5e5cfac0c6
commit
76aaa5101f
|
@ -197,44 +197,3 @@ void blk_add_timer(struct request *req)
|
||||||
mod_timer(&q->timeout, expiry);
|
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);
|
|
||||||
|
|
|
@ -827,7 +827,6 @@ extern bool __blk_end_request_err(struct request *rq, int error);
|
||||||
extern void blk_complete_request(struct request *);
|
extern void blk_complete_request(struct request *);
|
||||||
extern void __blk_complete_request(struct request *);
|
extern void __blk_complete_request(struct request *);
|
||||||
extern void blk_abort_request(struct request *);
|
extern void blk_abort_request(struct request *);
|
||||||
extern void blk_abort_queue(struct request_queue *);
|
|
||||||
extern void blk_unprep_request(struct request *);
|
extern void blk_unprep_request(struct request *);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Reference in New Issue