From 283b84606b6fc326692c03273de1774e8c122f9a Mon Sep 17 00:00:00 2001
From: "George.Wilson" <george.wilson@delphix.com>
Date: Mon, 29 Oct 2012 12:08:09 -0500
Subject: 3246 ZFS I/O deadman thread Reviewed by: Matt Ahrens
 <matthew.ahrens@delphix.com> Reviewed by: Eric Schrock
 <eric.schrock@delphix.com> Reviewed by: Christopher Siden
 <chris.siden@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org>

---
 usr/src/uts/intel/zfs/spa_boot.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'usr/src/uts/intel/zfs/spa_boot.c')

diff --git a/usr/src/uts/intel/zfs/spa_boot.c b/usr/src/uts/intel/zfs/spa_boot.c
index a6cdb81890..adbcffaef0 100644
--- a/usr/src/uts/intel/zfs/spa_boot.c
+++ b/usr/src/uts/intel/zfs/spa_boot.c
@@ -24,9 +24,16 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
 #include <sys/zio.h>
 #include <sys/spa.h>
 #include <sys/sunddi.h>
+#include <sys/x86_archext.h>
+
+extern int zfs_deadman_enabled;
 
 char *
 spa_get_bootprop(char *propname)
@@ -44,3 +51,21 @@ spa_free_bootprop(char *value)
 {
 	ddi_prop_free(value);
 }
+
+void
+spa_arch_init(void)
+{
+	/*
+	 * Configure the default settings for the zfs deadman unless
+	 * overriden by /etc/system.
+	 */
+	if (zfs_deadman_enabled == -1) {
+		/*
+		 * Disable the zfs deadman logic on VMware deployments.
+		 */
+		if (get_hwenv() == HW_VMWARE)
+			zfs_deadman_enabled = 0;
+		else
+			zfs_deadman_enabled = 1;
+	}
+}
-- 
cgit v1.2.3