From 0ec487a5c52e7a913e7238b2268e0ae0187c691b Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 30 Nov 2012 15:30:35 -0800 Subject: [PATCH] kernel - Move dsched_disk_destroy_callback() call * Move the dsched_disk_destroy_callback() call from the caller to the message handler to avoid racing a disk probe that might be running at the time (if a disk device is added and destroyed quickly). --- sys/kern/subr_disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 6167227ddd..8a9c5695b8 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -483,6 +483,7 @@ disk_msg_core(void *arg) "DISK_DISK_DESTROY: %s\n", dp->d_cdev->si_name); disk_iocom_uninit(dp); + dsched_disk_destroy_callback(dp); devfs_destroy_related(dp->d_cdev); destroy_dev(dp->d_cdev); destroy_only_dev(dp->d_rawdev); @@ -816,7 +817,6 @@ disk_setdiskinfo_sync(struct disk *disk, struct disk_info *info) void disk_destroy(struct disk *disk) { - dsched_disk_destroy_callback(disk); disk_msg_send_sync(DISK_DISK_DESTROY, disk, NULL); return; } -- 2.41.0