svn commit: r269222 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Tue Jul 29 06:57:13 2014
New Revision: 269222
URL: http://svnweb.freebsd.org/changeset/base/269222

Log:
  Reschedule the 'deadman' callout after handling, this makes our
  code behave more like it is on Solaris.
  
  Reported by:	avg
  Reviewed by:	avg, mav (but bugs are mine)
  
  Differential Revision: https://phabric.freebsd.org/D457

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c	Tue Jul 29 06:00:48 2014	(r269221)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c	Tue Jul 29 06:57:13 2014	(r269222)
@@ -570,6 +570,12 @@ spa_deadman(void *arg)
 	    ++spa->spa_deadman_calls);
 	if (zfs_deadman_enabled)
 		vdev_deadman(spa->spa_root_vdev);
+#ifdef __FreeBSD__
+#ifdef _KERNEL
+	callout_schedule(&spa->spa_deadman_cycid,
+	    hz * zfs_deadman_checktime_ms / MILLISEC);
+#endif
+#endif
 }
 
 /*