From owner-svn-src-head@freebsd.org  Tue Oct 24 14:59:32 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA4B8E4FEA3;
 Tue, 24 Oct 2017 14:59:32 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A9BC539EC;
 Tue, 24 Oct 2017 14:59:32 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9OExVC1003080;
 Tue, 24 Oct 2017 14:59:31 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9OExVSF003079;
 Tue, 24 Oct 2017 14:59:31 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201710241459.v9OExVSF003079@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 24 Oct 2017 14:59:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324957 - head/sys/dev/iscsi
X-SVN-Group: head
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: head/sys/dev/iscsi
X-SVN-Commit-Revision: 324957
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Oct 2017 14:59:33 -0000

Author: avg
Date: Tue Oct 24 14:59:31 2017
New Revision: 324957
URL: https://svnweb.freebsd.org/changeset/base/324957

Log:
  iscsi_shutdown_post: do nothing if panic-ing
  
  There is nothing that that routine should or could really do in that
  context.
  
  Reported by:	Ben RUBSON <ben.rubson@gmail.com>
  MFC after:	1 week

Modified:
  head/sys/dev/iscsi/iscsi.c

Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c	Tue Oct 24 14:34:25 2017	(r324956)
+++ head/sys/dev/iscsi/iscsi.c	Tue Oct 24 14:59:31 2017	(r324957)
@@ -2458,8 +2458,10 @@ static void
 iscsi_shutdown_post(struct iscsi_softc *sc)
 {
 
-	ISCSI_DEBUG("removing all sessions due to shutdown");
-	iscsi_terminate_sessions(sc);
+	if (panicstr == NULL) {
+		ISCSI_DEBUG("removing all sessions due to shutdown");
+		iscsi_terminate_sessions(sc);
+	}
 }
 
 static int