From nobody Tue Nov 08 19:29:42 2022 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 4N6J870Y7Kz4XJvR; Tue, 8 Nov 2022 19:29:43 +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 4N6J8701xNz4WmR; Tue, 8 Nov 2022 19:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667935783; 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=NlLAQuwodgQBMU+rdzk31eHYWMOCnNeH/lHFE4IdHiw=; b=l2H93yamyGbkpaMt2tDLDXSA+UN9vVvuk0i1VIFqxW+T/BJUQRGCQbPjetd30CWM239NRp gc5cRFzsZ9jUkOuxjwyP/U6HeSM97GmOFBCjwkCDRgZkf7Yurl3fVWFYG+LOMBQyMl9Tk4 vyr7jO7klfNksBVO8UbsGvMCZr/A50fYOJDIayIQNtn9sIv1owTP0eWMyLPat+YnrqVDRr mLyxU8BqDC6v0s9x+RrY0n5/YNazhS4ffTGu+MxD1dJjpb6piQ3Ptq8S9CcC3bYYTsB7Yd REQKK8UL1O2lHutKW0x+7He1fXHHG2lHaS7l3hcx95yPtbxnc/BDDTp2JM0gnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667935783; 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=NlLAQuwodgQBMU+rdzk31eHYWMOCnNeH/lHFE4IdHiw=; b=N+AGQ7rSzlmBIhN1dI+H6ZvQbSzPZcsZgIsaZ900klSBkmtqxJH3LwUTi+9h9uLtfdOnPZ w7LZm0j+vHpTVKFVwWmdHcYG6EhMfGvxdv8an83Pg2y+pKezaO8UyYR4/kot+rxhu7JxBS fi1Z6Sw3UGKNyPnO8GA72I1wqu7jCQBSc+O79z0VpVLeXGCvQ7XlPQtH6S+6g5JmHASzQd tKO2pmq25q7Yds33kDgmiepYws7GcHuVrRoAqcc9wc4uyGcCIv06PAexHLjWDIFTPGKLlM BxMbCACFxjDs0vxsXN3zuMO8YSWdP/wOuDEvhl9jg72l60BFWpBq0Ofjl09B3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667935783; a=rsa-sha256; cv=none; b=REV512GlWk82Dx3INDuM57tB2z/hzkDr7orAb4Wvmuub4wv6B2IsINQFd90HlEr6Nb2aP9 FyC9SXXXK7mPe0arL2oVguuorWfj+n+lEIomx5iPI5e4gdwESuAPFLXh1k6kRSDueBPiHY ka2lUC57AgjDM+VOreOLWpaZuSG8r6I3WRvmu1C1qnQJIsluHRU9F2LrLpi/PUSklyBk2p 3nQ7npEEXWJxF2/r499QTbSt6kTOleJVVayq3E436bQtZPhzNjLoSbmBzjysJI194f2TKk 9Xcrab421oA8ElrNq3VaKC9WcjAsbne5YfAOFhYfzIaHu9JNsMyPs+Ri8yz/lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6J866BL5ztm7; Tue, 8 Nov 2022 19:29:42 +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 2A8JTgde028701; Tue, 8 Nov 2022 19:29:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A8JTgAl028700; Tue, 8 Nov 2022 19:29:42 GMT (envelope-from git) Date: Tue, 8 Nov 2022 19:29:42 GMT Message-Id: <202211081929.2A8JTgAl028700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e4bc19b2faa7 - main - cxgbe tom: Fix jobtotid() compilation. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4bc19b2faa7fdb433a685d6de2cc7571d129699 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e4bc19b2faa7fdb433a685d6de2cc7571d129699 commit e4bc19b2faa7fdb433a685d6de2cc7571d129699 Author: John Baldwin AuthorDate: 2022-11-08 19:25:58 +0000 Commit: John Baldwin CommitDate: 2022-11-08 19:25:58 +0000 cxgbe tom: Fix jobtotid() compilation. The previous commit lost an implicit struct socket * cast. Use an inline function instead as the macro is already rather long. Fixes: e1401f75790f cxgbe: use standard sototcpcb() accessor macro to get socket's tcpcb Sponsored by: Chelsio Communications --- sys/dev/cxgbe/tom/t4_cpl_io.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 94b92dbf112b..7449029a7082 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -2052,8 +2052,20 @@ t4_uninit_cpl_io_handlers(void) #define aio_sent backend3 #define aio_refs backend4 -#define jobtotid(job) \ - (((struct toepcb *)(sototcpcb((job)->fd_file->f_data)->t_toe))->tid) +#ifdef VERBOSE_TRACES +static int +jobtotid(struct kaiocb *job) +{ + struct socket *so; + struct tcpcb *tp; + struct toepcb *toep; + + so = job->fd_file->f_data; + tp = sototcpcb(so); + toep = tp->t_toe; + return (toep->tid); +} +#endif static void aiotx_free_job(struct kaiocb *job)