Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 3 Dec 2019 16:50:06 +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-12@freebsd.org
Subject:   svn commit: r355338 - stable/12/sys/cam
Message-ID:  <201912031650.xB3Go6LG090416@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Tue Dec  3 16:50:06 2019
New Revision: 355338
URL: https://svnweb.freebsd.org/changeset/base/355338

Log:
  MFC r355013: Remove xpt_lock mutex.
  
  CAM does not require SIM locks for years, and obviously does not require
  it for completely virtual XPT SIM.

Modified:
  stable/12/sys/cam/cam_xpt.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/cam/cam_xpt.c
==============================================================================
--- stable/12/sys/cam/cam_xpt.c	Tue Dec  3 16:48:21 2019	(r355337)
+++ stable/12/sys/cam/cam_xpt.c	Tue Dec  3 16:50:06 2019	(r355338)
@@ -128,7 +128,6 @@ struct xpt_softc {
 	struct root_hold_token	xpt_rootmount;
 
 	struct mtx		xpt_topo_lock;
-	struct mtx		xpt_lock;
 	struct taskqueue	*xpt_taskq;
 };
 
@@ -895,7 +894,6 @@ xpt_init(void *dummy)
 	STAILQ_INIT(&xsoftc.highpowerq);
 	xsoftc.num_highpower = CAM_MAX_HIGHPOWER;
 
-	mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF);
 	mtx_init(&xsoftc.xpt_highpower_lock, "XPT highpower lock", NULL, MTX_DEF);
 	xsoftc.xpt_taskq = taskqueue_create("CAM XPT task", M_WAITOK,
 	    taskqueue_thread_enqueue, /*context*/&xsoftc.xpt_taskq);
@@ -920,21 +918,18 @@ xpt_init(void *dummy)
 				"xpt",
 				/*softc*/NULL,
 				/*unit*/0,
-				/*mtx*/&xsoftc.xpt_lock,
+				/*mtx*/NULL,
 				/*max_dev_transactions*/0,
 				/*max_tagged_dev_transactions*/0,
 				devq);
 	if (xpt_sim == NULL)
 		return (ENOMEM);
 
-	mtx_lock(&xsoftc.xpt_lock);
 	if ((status = xpt_bus_register(xpt_sim, NULL, 0)) != CAM_SUCCESS) {
-		mtx_unlock(&xsoftc.xpt_lock);
 		printf("xpt_init: xpt_bus_register failed with status %#x,"
 		       " failing attach\n", status);
 		return (EINVAL);
 	}
-	mtx_unlock(&xsoftc.xpt_lock);
 
 	/*
 	 * Looking at the XPT from the SIM layer, the XPT is

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912031650.xB3Go6LG090416>