From owner-svn-src-head@freebsd.org  Fri Nov  6 17:29:22 2015
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 C4633A26D9B;
 Fri,  6 Nov 2015 17:29:22 +0000 (UTC) (envelope-from mav@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 8B2E119B3;
 Fri,  6 Nov 2015 17:29:22 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA6HTL2J088167;
 Fri, 6 Nov 2015 17:29:21 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA6HTLAA088166;
 Fri, 6 Nov 2015 17:29:21 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201511061729.tA6HTLAA088166@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 6 Nov 2015 17:29:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290458 - head/sys/cam/ctl
X-SVN-Group: head
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.20
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: Fri, 06 Nov 2015 17:29:22 -0000

Author: mav
Date: Fri Nov  6 17:29:21 2015
New Revision: 290458
URL: https://svnweb.freebsd.org/changeset/base/290458

Log:
  Add two more KASSERTs.

Modified:
  head/sys/cam/ctl/ctl.c

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c	Fri Nov  6 17:12:33 2015	(r290457)
+++ head/sys/cam/ctl/ctl.c	Fri Nov  6 17:29:21 2015	(r290458)
@@ -11042,7 +11042,15 @@ ctl_check_for_blockage(struct ctl_lun *l
 		return (CTL_ACTION_BLOCK);
 
 	pending_entry = ctl_get_cmd_entry(&pending_io->scsiio, NULL);
+	KASSERT(pending_entry->seridx < CTL_SERIDX_COUNT,
+	    ("%s: Invalid seridx %d for pending CDB %02x %02x @ %p",
+	     __func__, pending_entry->seridx, pending_io->scsiio.cdb[0],
+	     pending_io->scsiio.cdb[1], pending_io));
 	ooa_entry = ctl_get_cmd_entry(&ooa_io->scsiio, NULL);
+	KASSERT(ooa_entry->seridx < CTL_SERIDX_COUNT,
+	    ("%s: Invalid seridx %d for ooa CDB %02x %02x @ %p",
+	     __func__, ooa_entry->seridx, ooa_io->scsiio.cdb[0],
+	     ooa_io->scsiio.cdb[1], ooa_io));
 
 	serialize_row = ctl_serialize_table[ooa_entry->seridx];