drbd: fix rmmod cleanup, remove _all_ debugfs entries
authorLars Ellenberg <lars.ellenberg@linbit.com>
Tue, 29 Aug 2017 08:20:41 +0000 (10:20 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 29 Aug 2017 21:34:45 +0000 (15:34 -0600)
If there are still resources defined, but "empty", no more volumes
or connections configured, they don't hold module reference counts,
so rmmod is possible.

To avoid DRBD leftovers in debugfs, we need to call our global
drbd_debugfs_cleanup() only after all resources have been cleaned up.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/drbd/drbd_main.c

index 056d9ab91c2962aa8dafe604c26feadf0ae3528c..8b8dd82da3c4486f434606904a07a6e157963130 100644 (file)
@@ -2420,7 +2420,6 @@ static void drbd_cleanup(void)
                destroy_workqueue(retry.wq);
 
        drbd_genl_unregister();
-       drbd_debugfs_cleanup();
 
        idr_for_each_entry(&drbd_devices, device, i)
                drbd_delete_device(device);
@@ -2431,6 +2430,8 @@ static void drbd_cleanup(void)
                drbd_free_resource(resource);
        }
 
+       drbd_debugfs_cleanup();
+
        drbd_destroy_mempools();
        unregister_blkdev(DRBD_MAJOR, "drbd");