Merge pull request #35 from DataCoreSoftware/zfs-442

imtiazdc · web-flow · commit bc0c9d2cfdac · 2021-01-11T21:50:32.000+05:30
ZFSin crash on zpool remove
diff --git a/ZFSin/zfs/module/zfs/metaslab.c b/ZFSin/zfs/module/zfs/metaslab.c
@@ -848,9 +848,10 @@ metaslab_group_passivate(metaslab_group_t *mg)
 	mg->mg_prev = NULL;
 	mg->mg_next = NULL;
 	if (mg->mg_kstat != NULL) {
-		metaslab_group_kstat_t* data = mg->mg_kstat->ks_data;
+		kmem_free(mg->mg_kstat->ks_data, sizeof(metaslab_group_kstat_t));
+		mg->mg_kstat->ks_data = NULL;
 		kstat_delete(mg->mg_kstat);
-		kmem_free(data, sizeof(metaslab_group_kstat_t));
+		mg->mg_kstat = NULL;
 	}
 	mutex_destroy(&mg->mg_kstat_lock);
 }
diff --git a/ZFSin/zfs/module/zfs/vdev_removal.c b/ZFSin/zfs/module/zfs/vdev_removal.c
@@ -1504,6 +1504,7 @@ spa_vdev_remove_thread(void *arg)
 		ASSERT0(range_tree_space(svr->svr_allocd_segs));
 		vdev_remove_complete(spa);
 	}
+	thread_exit();
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -848,9 +848,10 @@ metaslab_group_passivate(metaslab_group_t *mg)`
`848`	`848`	`mg->mg_prev = NULL;`
`849`	`849`	`mg->mg_next = NULL;`
`850`	`850`	`if (mg->mg_kstat != NULL) {`
`851`		`- metaslab_group_kstat_t* data = mg->mg_kstat->ks_data;`
	`851`	`+ kmem_free(mg->mg_kstat->ks_data, sizeof(metaslab_group_kstat_t));`
	`852`	`+ mg->mg_kstat->ks_data = NULL;`
`852`	`853`	`kstat_delete(mg->mg_kstat);`
`853`		`- kmem_free(data, sizeof(metaslab_group_kstat_t));`
	`854`	`+ mg->mg_kstat = NULL;`
`854`	`855`	`}`
`855`	`856`	`mutex_destroy(&mg->mg_kstat_lock);`
`856`	`857`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1504,6 +1504,7 @@ spa_vdev_remove_thread(void *arg)`
`1504`	`1504`	`ASSERT0(range_tree_space(svr->svr_allocd_segs));`
`1505`	`1505`	`vdev_remove_complete(spa);`
`1506`	`1506`	`}`
	`1507`	`+ thread_exit();`
`1507`	`1508`	`}`
`1508`	`1509`
`1509`	`1510`	`void`