Having REQ_DONTPREP set on a request can indicated that resources have been
allocated for this request. In elv_abort_queue skip requests with
REQ_DONTPREP set to avoid leaking resources.
Signed-off-by: Mike Anderson <andmike@xxxxxxxxxxxxxxxxxx>
Cc: Jens Axobe <jens.axboe@xxxxxxxxxx>
---
block/elevator.c | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/block/elevator.c b/block/elevator.c
index df75676..ac98008 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -807,10 +807,18 @@ int elv_may_queue(struct request_queue *q, int rw)
void elv_abort_queue(struct request_queue *q)
{
- struct request *rq;
+ struct request *rq, *tmp;
+ LIST_HEAD(list);
- while (!list_empty(&q->queue_head)) {
- rq = list_entry_rq(q->queue_head.next);
+ /*
+ * Splice entries to local list, in case the list contains some
+ * requests marked REQ_DONTPREP.
+ */
+ list_splice_init(&q->queue_head, &list);
+
+ list_for_each_entry_safe(rq, tmp, &list, queuelist) {
+ if (rq->cmd_flags & REQ_DONTPREP)
+ continue;
rq->cmd_flags |= REQ_QUIET;
trace_block_rq_abort(q, rq);
/*
@@ -820,6 +828,13 @@ void elv_abort_queue(struct request_queue *q)
blk_start_request(rq);
__blk_end_request_all(rq, -EIO);
}
+
+ /*
+ * In case requests with REQ_DONTPREP where skipped splice the
+ * local list back.
+ */
+ list_splice(&list, &q->queue_head);
+
}
EXPORT_SYMBOL(elv_abort_queue);
--
1.6.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
