diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2011-05-20 15:34:43 +0200 |
|---|---|---|
| committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2011-11-04 20:53:03 +0100 |
| commit | eac623ba7a91474a688eb5d0fcd0eaa6a56dc41c (patch) | |
| tree | 59a355c616c3f8b717e73aac01af2f9e3ffdc60c /drivers/block | |
| parent | NVMe: Return real error from nvme_create_queue (diff) | |
| download | linux-eac623ba7a91474a688eb5d0fcd0eaa6a56dc41c.tar.xz linux-eac623ba7a91474a688eb5d0fcd0eaa6a56dc41c.zip | |
NVMe: Add the nvme thread to the wait queue before waking it up
If the I/O was not completed by a single NVMe command, we add the
bio to the congestion list and wake up the kthread to resubmit it.
But the kthread calls remove_wait_queue() unconditionally, which
will oops if it's not on the wait queue. So add the kthread to
the wait queue before waking it up.
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nvme.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c index 843edbd79c56..f5e51a6116e3 100644 --- a/drivers/block/nvme.c +++ b/drivers/block/nvme.c @@ -325,6 +325,8 @@ static void bio_completion(struct nvme_queue *nvmeq, void *ctx, if (status) { bio_endio(bio, -EIO); } else if (bio->bi_vcnt > bio->bi_idx) { + if (bio_list_empty(&nvmeq->sq_cong)) + add_wait_queue(&nvmeq->sq_full, &nvmeq->sq_cong_wait); bio_list_add(&nvmeq->sq_cong, bio); wake_up_process(nvme_thread); } else { |