2021-06-07 08:48:23

by Daniel Wagner

Subject: [PATCH v3] nvme: remove superfluous bio_set_dev in nvme_requeue_work

Commit ce86dad222e9 ("nvme-multipath: reset bdev to ns head when
failover") moved the reset code where the bio is added to the
requeue_list for the failover path. But it left the original
bio_set_dev in nvme_requeue_work.

There is a second path to nvme_requee_work. It is via
nvme_ns_head_submit_bio. Though we don't have to set bio->bi_bdev for
this path either, as it points to the correct bdev already.

Let's remove the bio_set_dev. It's updating the bio->bi_bdev with the
same pointer and thus it's unnecessary.

Signed-off-by: Daniel Wagner <[email protected]>
---

v3: - dropped bio_set_dev from nvme_ns_head_submit_bio
- renamed patch
v2: https://lore.kernel.org/linux-nvme/[email protected]/

drivers/nvme/host/multipath.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 127a17b4c13d..a501917d4c6e 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -435,11 +435,6 @@ static void nvme_requeue_work(struct work_struct *work)
next = bio->bi_next;
bio->bi_next = NULL;

- /*
- * Reset disk to the mpath node and resubmit to select a new
- * path.
- */
- bio_set_dev(bio, head->disk->part0);
submit_bio_noacct(bio);
}
}
--
2.29.2

2021-06-09 06:20:11

by Christoph Hellwig

Subject: Re: [PATCH v3] nvme: remove superfluous bio_set_dev in nvme_requeue_work

Thanks,

applied to nvme-5.14.