summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2012-08-20 14:57:49 -0600
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2012-11-13 09:13:49 -0500
commit3295874b6074d749516d6decd43afad7bf6e38ff (patch)
treeff2acce6c13bdaed845b00b9960b0663c24ce589
parent859361a228258edf4821d9f5635825033eca78e8 (diff)
downloadlinux-3.10-3295874b6074d749516d6decd43afad7bf6e38ff.tar.gz
linux-3.10-3295874b6074d749516d6decd43afad7bf6e38ff.tar.bz2
linux-3.10-3295874b6074d749516d6decd43afad7bf6e38ff.zip
NVMe: End queued bio requests when freeing queue
If the queue has bios queued on it when it is freed, bio_endio() must be called for them first. Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
-rw-r--r--drivers/block/nvme.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 954a61018dc..af88635e44e 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -909,6 +909,10 @@ static void nvme_free_queue(struct nvme_dev *dev, int qid)
spin_lock_irq(&nvmeq->q_lock);
nvme_cancel_ios(nvmeq, false);
+ while (bio_list_peek(&nvmeq->sq_cong)) {
+ struct bio *bio = bio_list_pop(&nvmeq->sq_cong);
+ bio_endio(bio, -EIO);
+ }
spin_unlock_irq(&nvmeq->q_lock);
irq_set_affinity_hint(vector, NULL);