Merge pull request openzfs#23 from bgly/forced_unmount_fix

Forced unmount panic
KlaraSystems · Jan 17, 2020 · 62f6d3f · 62f6d3f
2 parents 4c2a046 + 8c933c9
commit 62f6d3f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
@@ -1724,7 +1724,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
 	 * Close the zil. NB: Can't close the zil while zfs_inactive
 	 * threads are blocked as zil_close can call zfs_inactive.
 	 */
-	if (zfsvfs->z_log) {
+	if ((zfsvfs->z_log) && (killer == curthread)){
 		zil_close(zfsvfs->z_log);
 		zfsvfs->z_log = NULL;
 	}