From f05ed067e2e13003f6e254d530c41235e814e775 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Wed, 26 Feb 2003 15:15:22 -0800 Subject: [PATCH] [PATCH] dm: deregister the misc device before removing /dev/mapper Fix problem with devfs when unloading the dm module. dm-ioctl.c: deregister the misc device, and its associated symlink *before* removing the /dev/mapper dir. [Alasdair Kergon] --- drivers/md/dm-ioctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 62fcd80e611d5..a758417cce2e2 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1127,17 +1127,17 @@ int __init dm_interface_init(void) return 0; failed: + devfs_remove(DM_DIR "/control"); + if (misc_deregister(&_dm_misc) < 0) + DMERR("misc_deregister failed for control device"); dm_hash_exit(); - misc_deregister(&_dm_misc); return r; } void dm_interface_exit(void) { - dm_hash_exit(); - devfs_remove(DM_DIR "/control"); - if (misc_deregister(&_dm_misc) < 0) DMERR("misc_deregister failed for control device"); + dm_hash_exit(); } -- 2.53.0