svn commit: r276269 - stable/10/sys/dev/isci

[Scott Long]

Author: scottl
Date: Fri Dec 26 23:18:09 2014
New Revision: 276269
URL: https://svnweb.freebsd.org/changeset/base/276269

Log:
  MFC 276174:
  
  Fix tunable and sysctl handling of the fail_on_task_timeout knob.
  
  Reviewed by:    emax
  Obtained from:  Netflix, Inc.

Modified:
  stable/10/sys/dev/isci/isci_controller.c
  stable/10/sys/dev/isci/isci_sysctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/isci/isci_controller.c
==============================================================================
--- stable/10/sys/dev/isci/isci_controller.c	Fri Dec 26 22:56:02 2014	(r276268)
+++ stable/10/sys/dev/isci/isci_controller.c	Fri Dec 26 23:18:09 2014	(r276269)
@@ -373,6 +373,8 @@ SCI_STATUS isci_controller_initialize(st
 
 	fail_on_timeout = 1;
 	TUNABLE_INT_FETCH("hw.isci.fail_on_task_timeout", &fail_on_timeout);
+	controller->fail_on_task_timeout = fail_on_timeout;
+
 	/* Attach to CAM using xpt_bus_register now, then immediately freeze
 	 *  the simq.  It will get released later when initial domain discovery
 	 *  is complete.

Modified: stable/10/sys/dev/isci/isci_sysctl.c
==============================================================================
--- stable/10/sys/dev/isci/isci_sysctl.c	Fri Dec 26 22:56:02 2014	(r276268)
+++ stable/10/sys/dev/isci/isci_sysctl.c	Fri Dec 26 23:18:09 2014	(r276269)
@@ -226,12 +226,13 @@ static int
 isci_sysctl_fail_on_task_timeout(SYSCTL_HANDLER_ARGS)
 {
 	struct isci_softc	*isci = (struct isci_softc *)arg1;
-	int32_t			fail_on_timeout = 0;
+	int32_t			fail_on_timeout;
 	int			error, i;
 
+	fail_on_timeout = isci->controllers[0].fail_on_task_timeout;
 	error = sysctl_handle_int(oidp, &fail_on_timeout, 0, req);
 
-	if (error || fail_on_timeout == 0)
+	if (error || req->newptr == NULL)
 		return (error);
 
 	for (i = 0; i < isci->controller_count; i++)