Skip to content

Commit 5285899

Browse files
Mohamed KhalfellaChristoph Hellwig
authored andcommitted
nvmet: initialize discovery subsys after debugfs is initialized
During nvme target initialization discovery subsystem is initialized before "nvmet" debugfs directory is created. This results in discovery subsystem debugfs directory to be created in debugfs root directory. nvmet_init() -> nvmet_init_discovery() -> nvmet_subsys_alloc() -> nvmet_debugfs_subsys_setup() In other words, the codepath above is exeucted before nvmet_debugfs is created. We get /sys/kernel/debug/nqn.2014-08.org.nvmexpress.discovery instead of /sys/kernel/debug/nvmet/nqn.2014-08.org.nvmexpress.discovery. Move nvmet_init_discovery() call after nvmet_init_debugfs() to fix it. Fixes: 649fd41 ("nvmet: add debugfs support") Signed-off-by: Mohamed Khalfella <[email protected]> Reviewed-by: Chaitanya Kulkarni <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Reviewed-by: Daniel Wagner <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent e715b87 commit 5285899

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/nvme/target/core.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,24 +1960,24 @@ static int __init nvmet_init(void)
19601960
if (!nvmet_wq)
19611961
goto out_free_buffered_work_queue;
19621962

1963-
error = nvmet_init_discovery();
1963+
error = nvmet_init_debugfs();
19641964
if (error)
19651965
goto out_free_nvmet_work_queue;
19661966

1967-
error = nvmet_init_debugfs();
1967+
error = nvmet_init_discovery();
19681968
if (error)
1969-
goto out_exit_discovery;
1969+
goto out_exit_debugfs;
19701970

19711971
error = nvmet_init_configfs();
19721972
if (error)
1973-
goto out_exit_debugfs;
1973+
goto out_exit_discovery;
19741974

19751975
return 0;
19761976

1977-
out_exit_debugfs:
1978-
nvmet_exit_debugfs();
19791977
out_exit_discovery:
19801978
nvmet_exit_discovery();
1979+
out_exit_debugfs:
1980+
nvmet_exit_debugfs();
19811981
out_free_nvmet_work_queue:
19821982
destroy_workqueue(nvmet_wq);
19831983
out_free_buffered_work_queue:

0 commit comments

Comments
 (0)