NTB: ntb_transport: fix debugfs_remove_recursive

Allen Hubbe · jonmason · commit dd62245e73de · 2017-02-16T23:10:52.000-05:00
The call to debugfs_remove_recursive(qp->debugfs_dir) of the sub-level directory must not be later than debugfs_remove_recursive(nt_debugfs_dir) of the top-level directory. Otherwise, the sub-level directory will not exist, and it would be invalid (panic) to attempt to remove it. This removes the top-level directory last, after sub-level directories have been cleaned up. Signed-off-by: Allen Hubbe <Allen.Hubbe@dell.com> Fixes: e26a584 ("NTB: Split ntb_hw_intel and ntb_transport drivers") Signed-off-by: Jon Mason <jdmason@kudzu.us>
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
@@ -2273,9 +2273,8 @@ module_init(ntb_transport_init);
 
 static void __exit ntb_transport_exit(void)
 {
-	debugfs_remove_recursive(nt_debugfs_dir);
-
 	ntb_unregister_client(&ntb_transport_client);
 	bus_unregister(&ntb_transport_bus);
+	debugfs_remove_recursive(nt_debugfs_dir);
 }
 module_exit(ntb_transport_exit);

Original file line number	Diff line number	Diff line change
`@@ -2273,9 +2273,8 @@ module_init(ntb_transport_init);`
`2273`	`2273`
`2274`	`2274`	`static void __exit ntb_transport_exit(void)`
`2275`	`2275`	`{`
`2276`		`- debugfs_remove_recursive(nt_debugfs_dir);`
`2277`		`-`
`2278`	`2276`	`ntb_unregister_client(&ntb_transport_client);`
`2279`	`2277`	`bus_unregister(&ntb_transport_bus);`
	`2278`	`+ debugfs_remove_recursive(nt_debugfs_dir);`
`2280`	`2279`	`}`
`2281`	`2280`	`module_exit(ntb_transport_exit);`