Date: Mon, 30 Nov 2015 21:16:27 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r291496 - stable/10/sys/cam/ctl Message-ID: <201511302116.tAULGRXb063483@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Nov 30 21:16:26 2015 New Revision: 291496 URL: https://svnweb.freebsd.org/changeset/base/291496 Log: MFC r291383: Fix panic when trying to sort unsupported command in OOA queue. Handle unsupported commands as not conflicting/blocking. Modified: stable/10/sys/cam/ctl/ctl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl.c ============================================================================== --- stable/10/sys/cam/ctl/ctl.c Mon Nov 30 19:16:58 2015 (r291495) +++ stable/10/sys/cam/ctl/ctl.c Mon Nov 30 21:16:26 2015 (r291496) @@ -11093,6 +11093,8 @@ ctl_check_for_blockage(struct ctl_lun *l __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); + if (ooa_entry->seridx == CTL_SERIDX_INVLD) + return (CTL_ACTION_PASS); /* Unsupported command in OOA queue */ 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],
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511302116.tAULGRXb063483>