Date: Fri, 27 Nov 2015 14:29:04 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291383 - head/sys/cam/ctl Message-ID: <201511271429.tARET4v4052740@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Fri Nov 27 14:29:04 2015 New Revision: 291383 URL: https://svnweb.freebsd.org/changeset/base/291383 Log: Fix panic when trying to sort unsupported command in OOA queue. Handle unsupported commands as not conflicting/blocking. Modified: head/sys/cam/ctl/ctl.c Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Fri Nov 27 14:20:32 2015 (r291382) +++ head/sys/cam/ctl/ctl.c Fri Nov 27 14:29:04 2015 (r291383) @@ -11091,6 +11091,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?201511271429.tARET4v4052740>