Skip to content

Commit 26d7fb4

Browse files
Hannes ReineckeChristoph Hellwig
authored andcommitted
nvme: fixup scan failure for non-ANA multipath controllers
Commit 62baf70 caused the ANA log page to be re-read, even on controllers that do not support ANA. While this should generally harmless, some controllers hang on the unsupported log page and never finish probing. Fixes: 62baf70 ("nvme: re-read ANA log page after ns scan completes") Signed-off-by: Hannes Reinecke <hare@kernel.org> Tested-by: Srikanth Aithal <sraithal@amd.com> [hch: more detailed commit message] Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
1 parent 0b7a481 commit 26d7fb4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/nvme/host/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4300,7 +4300,7 @@ static void nvme_scan_work(struct work_struct *work)
43004300
if (test_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events))
43014301
nvme_queue_scan(ctrl);
43024302
#ifdef CONFIG_NVME_MULTIPATH
4303-
else
4303+
else if (ctrl->ana_log_buf)
43044304
/* Re-read the ANA log page to not miss updates */
43054305
queue_work(nvme_wq, &ctrl->ana_work);
43064306
#endif

0 commit comments

Comments
 (0)