From nobody Thu Jan 6 19:04:36 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 874D219439CC; Thu, 6 Jan 2022 19:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVG4N1WFRz4knS; Thu, 6 Jan 2022 19:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13F49250AF; Thu, 6 Jan 2022 19:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 206J4agf054130; Thu, 6 Jan 2022 19:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206J4aIK054129; Thu, 6 Jan 2022 19:04:36 GMT (envelope-from git) Date: Thu, 6 Jan 2022 19:04:36 GMT Message-Id: <202201061904.206J4aIK054129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: f9c51d3a1d10 - stable/13 - mps: Fix debugging line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f9c51d3a1d103dc112dfcc60da018468c7157e54 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641495876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zu+ePNhXRrt1CYRVJc1Dm4qAPn8H2digqb0DmfTYruU=; b=YERSu48LS8pO/Tubuy+TbxbRhNFvWqwPyOL4vUYiQC20imbKKTC/LpEpz3SGjg1Myjz4W4 YQkKgBiRntZZltBAb3QqqQeRKGgQwgGMjVmQWBL166pgBGm5kxYufdnWDYmym/BJvx1FJv nK/L+BZyjL1h95BWeYkEaCZ/cAuZ+4WdUwxic+/n9iC6wfENLEUeQEbTb98IpU/d79ajKo Aym5m20DCCKeqhDNPPQdnvTsTQcdMbalFQrLTTbCuGMpvVlfS9JoaxscD9eIll9mLNGPIE bSpPp1ITGewK/WTeoXuHi4abxBzt1LMJqEs0qvEdU4d3Qi1hdHrF7hDTSOgM2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641495876; a=rsa-sha256; cv=none; b=smGUl67Hi1h8cHtDinsQu9QUP4ZjYdWdy9krELDM6HLEcY/8UVAl2FvGfPW+Bjnqw0kIZq tQK2P7PHslAQdMwwRIS+6ckKNBrwDqWrixEDTebzHufx/CEF+qjzFhOZb4Tb/HNQ8dlyZg MPK5SdR/uo9/RTDgz5MI20m53QI995yRccfzyiLBt1UYxGi2a0f4vvr/gZLCFoe/eNjtLY sloqNRdujhveUuhYw5vRk6s3JnvcwMguennicRDcLGJnXRIvOBbvyZ/SGC7QJIUMqTIEtU nmuVU/nOEZhOf4v7FNJBe8/29yOjehDXBXe/N7IzBQLtIWwLRNHuayHKIJw+7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f9c51d3a1d103dc112dfcc60da018468c7157e54 commit f9c51d3a1d103dc112dfcc60da018468c7157e54 Author: Warner Losh AuthorDate: 2021-11-16 03:31:48 +0000 Commit: Alexander Motin CommitDate: 2022-01-06 19:01:19 +0000 mps: Fix debugging line Print cm instead of sc here, as is done in mpr. We can get the sc from cm, but not vice versa. Sponsored by: Netflix (cherry picked from commit b086bc0bf1dd78b161e3ba7a5732fc49ea3c1b82) --- sys/dev/mps/mps_sas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index 136e3586ef20..971ad8f4a123 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -1560,7 +1560,7 @@ mpssas_scsiio_timeout(void *data) MPS_FUNCTRACE(sc); mtx_assert(&sc->mps_mtx, MA_OWNED); - mps_dprint(sc, MPS_XINFO|MPS_RECOVERY, "Timeout checking cm %p\n", sc); + mps_dprint(sc, MPS_XINFO|MPS_RECOVERY, "Timeout checking cm %p\n", cm); /* * Run the interrupt handler to make sure it's not pending. This