Skip to content

Commit 1a9e587

Browse files
Hannes Reineckegregkh
authored andcommitted
nvme: fixup scan failure for non-ANA multipath controllers
commit 26d7fb4fd4ca1180e2fa96587dea544563b4962a upstream. Commit 62baf70c3274 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: 62baf70c3274 ("nvme: re-read ANA log page after ns scan completes") Signed-off-by: Hannes Reinecke <[email protected]> Tested-by: Srikanth Aithal <[email protected]> [hch: more detailed commit message] Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Sagi Grimberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 48600cb commit 1a9e587

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
@@ -4709,7 +4709,7 @@ static void nvme_scan_work(struct work_struct *work)
47094709
if (test_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events))
47104710
nvme_queue_scan(ctrl);
47114711
#ifdef CONFIG_NVME_MULTIPATH
4712-
else
4712+
else if (ctrl->ana_log_buf)
47134713
/* Re-read the ANA log page to not miss updates */
47144714
queue_work(nvme_wq, &ctrl->ana_work);
47154715
#endif

0 commit comments

Comments
 (0)