From nobody Wed Nov 24 09:39:21 2021 X-Original-To: dev-commits-src-main@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 CE05C189B9ED; Wed, 24 Nov 2021 09:39:21 +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 4HzbZ13zb8z4njx; Wed, 24 Nov 2021 09:39:21 +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 6960127A83; Wed, 24 Nov 2021 09:39:21 +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 1AO9dLws068545; Wed, 24 Nov 2021 09:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO9dLMs068544; Wed, 24 Nov 2021 09:39:21 GMT (envelope-from git) Date: Wed, 24 Nov 2021 09:39:21 GMT Message-Id: <202111240939.1AO9dLMs068544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1bc9ca3b35d2 - main - cam: Unbreak CAM_IO_STATS build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bc9ca3b35d280cdb0dbefa69bebf687970d1ef6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637746761; 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=8agzWhKsGvppXawFXLkwew+NLdAMJ0kLOeROyNsHhuw=; b=V3It5iGhhg4saIK71UByui7zWnV1dZBjG6piyIaYsvOPUtoSsSI8ZIRUAmzPCxDyujXboN QhaFEYWhBSxozWHhi7eqdYXKyv1qZ6LvaSp73Gp5pZnqqS2kgStCxH8cepFtLYiQFU/j1A 0s1o0ucDGwpiFVt3tV4KWTh3PgABWqKuhtPiEtibPnmqTkNR02LaVlX28B4ZCEZnLKXUAm dJnUml/3WqiA2RL1svNTF7VBP944MtRqvzuUxM82NdG4+9EfoNCxEW/GpBEoCH862SAR6v 4lvtDOQHk8fhNCb7mw981gm7ccpxnTbxWwA2WIAPg5Gx63WQCgjn8HUOpUjomw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637746761; a=rsa-sha256; cv=none; b=onU0exM+NrjUN3uk7CnT0+C1G0QMe5c55byU47TU0cncCaqWzrvkMCIU0swfXezyGiZR2M VfTbrYXUMQOtK5KRHkO+R4psA415gP3cEI4+Z3AkETRJ0xCbVHexNODJHWWUfLoUnrbsdc ZH2zxdlgRewf9mo5YkDt1sHJufFu29yzC+Gwkumqcx23ZNCPcF7WY+PSuOpwjsuhhD/xu9 NaPIhEJ57pRZOpn8A19vQkEbQl7b1Eo2FDoB8K7Sx8ICSNM4JQxWiXOSkhex9R5/KMy2Xx qysmHRPxyW5vlQTXUNDLKl1n7RZZZbhnoZrXoCct9UIFXwu8KBjtiD0Elpp5Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1bc9ca3b35d280cdb0dbefa69bebf687970d1ef6 commit 1bc9ca3b35d280cdb0dbefa69bebf687970d1ef6 Author: Warner Losh AuthorDate: 2021-11-24 09:10:53 +0000 Commit: Warner Losh CommitDate: 2021-11-24 09:36:48 +0000 cam: Unbreak CAM_IO_STATS build Fixes: 6637b7460066 Sponsored by: Netflix --- sys/cam/nvme/nvme_da.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index f1c9a9ec9fea..7a489afdb993 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -1267,6 +1267,13 @@ ndadone(struct cam_periph *periph, union ccb *done_ccb) static int ndaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) { +#ifdef CAM_IO_STATS + struct nda_softc *softc; + struct cam_periph *periph; + + periph = xpt_path_periph(ccb->ccb_h.path); + softc = (struct nda_softc *)periph->softc; +#endif switch (ccb->ccb_h.status & CAM_STATUS_MASK) { case CAM_CMD_TIMEOUT: