svn commit: r328705 - stable/11/sys/cam/nvme

Alexander Motin mav at FreeBSD.org
Thu Feb 1 19:27:11 UTC 2018


Author: mav
Date: Thu Feb  1 19:27:10 2018
New Revision: 328705
URL: https://svnweb.freebsd.org/changeset/base/328705

Log:
  MFC r303125 (by imp):
  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.

Modified:
  stable/11/sys/cam/nvme/nvme_xpt.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cam/nvme/nvme_xpt.c
==============================================================================
--- stable/11/sys/cam/nvme/nvme_xpt.c	Thu Feb  1 19:13:19 2018	(r328704)
+++ stable/11/sys/cam/nvme/nvme_xpt.c	Thu Feb  1 19:27:10 2018	(r328705)
@@ -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 *periph, union ccb 
 		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);
 }
 


More information about the svn-src-all mailing list