Skip to content

Commit 1f7fb42

Browse files
Hannes Reineckegregkh
Hannes Reinecke
authored andcommitted
nvme: fixup scan failure for non-ANA multipath controllers
commit 26d7fb4 upstream. 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 <[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 d2e15c2 commit 1f7fb42

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
@@ -4226,7 +4226,7 @@ static void nvme_scan_work(struct work_struct *work)
42264226
if (test_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events))
42274227
nvme_queue_scan(ctrl);
42284228
#ifdef CONFIG_NVME_MULTIPATH
4229-
else
4229+
else if (ctrl->ana_log_buf)
42304230
/* Re-read the ANA log page to not miss updates */
42314231
queue_work(nvme_wq, &ctrl->ana_work);
42324232
#endif

0 commit comments

Comments
 (0)