path: root/drivers/nvme
diff options
authorDaniel Wagner <>2021-05-03 19:03:03 +0200
committerChristoph Hellwig <>2021-05-04 09:39:23 +0200
commitce86dad222e9074d3ec174ec81cb463a770331b5 (patch)
tree1fe8534498736515b24ad6719dece49bdd3cd760 /drivers/nvme
parentd4060d2be1132596154f31f4d57976bd103e969d (diff)
nvme-multipath: reset bdev to ns head when failover
When a request finally completes in end_io() after it has failed over, the bdev pointer can be stale and thus the system can crash. Set the bdev back to ns head, so the request is map to an active path when resubmitted. Signed-off-by: Daniel Wagner <> Reviewed-by: Hannes Reinecke <> Signed-off-by: Christoph Hellwig <>
Diffstat (limited to 'drivers/nvme')
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 0d0de3433f37..0551796517e6 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -70,6 +70,7 @@ void nvme_failover_req(struct request *req)
struct nvme_ns *ns = req->q->queuedata;
u16 status = nvme_req(req)->status & 0x7ff;
unsigned long flags;
+ struct bio *bio;
@@ -84,6 +85,8 @@ void nvme_failover_req(struct request *req)
spin_lock_irqsave(&ns->head->requeue_lock, flags);
+ for (bio = req->bio; bio; bio = bio->bi_next)
+ bio_set_dev(bio, ns->head->disk->part0);
blk_steal_bios(&ns->head->requeue_list, req);
spin_unlock_irqrestore(&ns->head->requeue_lock, flags);