From nobody Mon Dec 06 15:56:34 2021 X-Original-To: dev-commits-src-all@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 8975118C5B3B; Mon, 6 Dec 2021 15:56:40 +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 4J77Mn2vsmz4bxb; Mon, 6 Dec 2021 15:56:37 +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 DF1896A9B; Mon, 6 Dec 2021 15:56:34 +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 1B6FuYYT033715; Mon, 6 Dec 2021 15:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6FuYsm033714; Mon, 6 Dec 2021 15:56:34 GMT (envelope-from git) Date: Mon, 6 Dec 2021 15:56:34 GMT Message-Id: <202112061556.1B6FuYsm033714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5932b2611341 - stable/13 - cam: Unbreak CAM_IO_STATS build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5932b26113418379d9c4d6d0c1ba6536394931f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638806198; 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=jpvUEbE50wDCJxu1FS71rCHeFipAIvT5AHnIBz8j9XM=; b=Rr2TpuAVnb6TStZcf1sbk/68JMo1YV+2t2xkp5aOuB3BWQSc0ne4AUfJlfsOwL3m0eZXb7 tZrrPe3fR3QPQ7qEuCt/Z+Pw8gnXwsAdm5Zxabdm17DybUPcy205W8D8/gABJOKuOTlVa/ nTt7E1E1U12Qdb2Svj1P/70vHCdcV072idKz5k2YWhRHsnpxGmikcPyHqB9HbsrbMp5d1r Rtd+lq6S0TNBxvEvTKR5ttcsyjplJQwsioIV1r22UesY2p4/hJ3pnjOd2FNBvGhNcfK1tS TnJjW6KXovTJrO+df0rRnXHGPj+84h3gCE7gYwWx+zbQg6qXLta6FMmZ3LHolg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638806198; a=rsa-sha256; cv=none; b=b0BKNqpB/DdWh3PJuBXgE1t0PACjuX67ngxK1lxjOQmtllkSouPCWFmhV8g8jHPcat0g6g BTLfZ+qDmbT8gfBVAI8hEU2ma4k0AwxHpBajpHoG9nI0GmuRemNwm4PBVqMjxHv5qtNlQ5 cVArubYVrbcOaXG8/81xTrJ79g8lItwEfd/CfUflLy/htpi0mcKTngquhaN3QoANW/6tzu pH3cAVAgoAkyzvS75NWMFQxcXB7v40DYSrfYsAs6083StB65MZ1XmgYpwuvunzKbX9CXa6 51l80rFKeyOSXgIUHCViHgCaIIp+SmCKrGm3jQztMiCmDOmwWH5XLZHnH6p/3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5932b26113418379d9c4d6d0c1ba6536394931f9 commit 5932b26113418379d9c4d6d0c1ba6536394931f9 Author: Warner Losh AuthorDate: 2021-11-24 09:10:53 +0000 Commit: Warner Losh CommitDate: 2021-12-06 15:55:58 +0000 cam: Unbreak CAM_IO_STATS build Fixes: 6637b7460066 Sponsored by: Netflix (cherry picked from commit 1bc9ca3b35d280cdb0dbefa69bebf687970d1ef6) --- 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: