svn commit: r282954 - stable/10/sys/dev/iscsi

[Edward Tomasz Napierala]

Author: trasz
Date: Fri May 15 10:47:25 2015
New Revision: 282954
URL: https://svnweb.freebsd.org/changeset/base/282954

Log:
  MFC r278233:
  
  Fix error handling.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/dev/iscsi/iscsi.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/iscsi/iscsi.c
==============================================================================
--- stable/10/sys/dev/iscsi/iscsi.c	Fri May 15 10:42:48 2015	(r282953)
+++ stable/10/sys/dev/iscsi/iscsi.c	Fri May 15 10:47:25 2015	(r282954)
@@ -1754,15 +1754,17 @@ iscsi_ioctl_session_add(struct iscsi_sof
 	arc4rand(&is->is_isid[1], 5, 0);
 	is->is_tsih = 0;
 	callout_init(&is->is_callout, 1);
-	callout_reset(&is->is_callout, 1 * hz, iscsi_callout, is);
-	TAILQ_INSERT_TAIL(&sc->sc_sessions, is, is_next);
 
 	error = kthread_add(iscsi_maintenance_thread, is, NULL, NULL, 0, 0, "iscsimt");
 	if (error != 0) {
 		ISCSI_SESSION_WARN(is, "kthread_add(9) failed with error %d", error);
+		sx_xunlock(&sc->sc_lock);
 		return (error);
 	}
 
+	callout_reset(&is->is_callout, 1 * hz, iscsi_callout, is);
+	TAILQ_INSERT_TAIL(&sc->sc_sessions, is, is_next);
+
 	/*
 	 * Trigger immediate reconnection.
 	 */