Author: imp
Date: Thu Jul 21 03:11:37 2016
New Revision: 303125
URL: https://svnweb.freebsd.org/changeset/base/303125
Log:
Remove some bogus comments and printfs. Also, we can't
cam_periph_releaes_locked() at the end of nvme_probe_start because we
hit an assertion which may be bogus. Instead, leak a periph until we
sort it out. Since these devices don't arrive and depart often, so
this is the lessor of two evils.
MFC after: 1 week
Modified:
head/sys/cam/nvme/nvme_xpt.c
Modified: head/sys/cam/nvme/nvme_xpt.c
==============================================================================
--- head/sys/cam/nvme/nvme_xpt.c Thu Jul 21 03:11:36 2016
(r303124)
+++ head/sys/cam/nvme/nvme_xpt.c Thu Jul 21 03:11:37 2016
(r303125)
@@ -163,13 +163,14 @@ static struct xpt_xport nvme_xport = {
struct xpt_xport *
nvme_get_xport(void)
{
+
return (&nvme_xport);
}
static void
nvme_probe_periph_init()
{
- printf("nvme cam probe device init\n");
+
}
static cam_status
@@ -297,18 +298,15 @@ nvme_probe_start(struct cam_periph *peri
start_ccb->ccb_h.status = CAM_REQ_CMP;
xpt_done(start_ccb);
}
-// XXX not sure I need this
-// XXX unlike other XPTs, we never freeze the queue since we have a
super-simple
-// XXX state machine
- /* Drop freeze taken due to CAM_DEV_QFREEZE flag set. -- did we really
do this? */
-// cam_release_devq(path, 0, 0, 0, FALSE);
cam_periph_invalidate(periph);
- cam_periph_release_locked(periph);
+ /* Can't release periph since we hit a (possibly bogus) assertion */
+// cam_periph_release_locked(periph);
}
static void
nvme_probe_cleanup(struct cam_periph *periph)
{
+
free(periph->softc, M_CAMXPT);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
