From nobody Thu Dec 28 19:18:17 2023 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 4T1JFP6JsGz54QY5; Thu, 28 Dec 2023 19:18:17 +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 4T1JFP4sgJz4PQP; Thu, 28 Dec 2023 19:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703791097; 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=S6Si97if/6XFjxv+NcsSWszPwbKETzMU3415iMR5F98=; b=ReR0S6IvQSSDP9ImuXdwc4Ekg+Jm+FXs3X4KnqplxBOvFVbs/e7Vz4+mcczRlnlbSo6fjv TnbJjEdPDlBynOcxY8ydvpHmYL/DN/yGTQVjMzN8cCpCriwHWJXrg9KpBTP7imrA+x8Siq 6Qbynq2aB+/aeKrb8R0GVfveOUtZ8RsFDATUVUo3cUfqKENI9mAa3ZnwPHAkD/+dNiq5bW QYrtKiXoIVbLe0R8AwYm4ihzmM1/rELiHAML3O7opnMrur0AxidKloJfnIHHmtw2KgdgiV z8DLStptZLZkboTjWs9awCKkhv1qcz+BlGoeFMURJcDRUq+muGAsbtFGeAza2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703791097; a=rsa-sha256; cv=none; b=qRdDuwHvdgvKf65orL/BXAP596375MqH/QeTm7+AzVW5BcuF9GbOOPPPqa9sFIUsBXtazy K7+liFodJJ7LlaT/qDFGTE+ecK6jCUHJCD9a3/tD2I+MPyBzK40VkJYxAlXp9QP502A781 s1LvmbMSK9OpvaUbXJ2IhZvWGXoWFecJ9YHEJOZg2UzHC3gYdtS+OmVyuqY3fw1eehIivN EAK887VCQUvUQsuXt685H5EhgLia53sNQZmvnmwr4hslXg4rXe0nVvINQBK2DbqK0IA1OL nZJ71it3KhCHnaoXMnG1EHVNiiYcmUJnNpVRVA5b05FFDATVqN5+GZfxuTofyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703791097; 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=S6Si97if/6XFjxv+NcsSWszPwbKETzMU3415iMR5F98=; b=OnBSZoqBOA3MoN1at1po1l/gFBx9r1vXSFIbrn/z9atWe5EX4WliX+2qkMMFJZNALztWv2 XPNBDi05WWQC1an2qQtHUrDeBfgAwrNjy5YwPhtKqKNpi5lzYKvpTGL4huU6995JQsR7Sy vWzoXzOQlqp9OHF2H1Ql7Ihrv04HLrtfxCSNVkts4UXbUljLwd/nF18HIkBjHwIy2IG7br bupoXYYBF38KWhb4eEMeGIvQ8/EIZakFXJ8FzFmvUTQQ1DpBx3muNgIrkzAOYofTawZQQc z1GuZwK5wEH0HlPkhhyUF684f9X8yjWw13Vpm9mhrzn33vkS5UvqQQ5oWlOgpA== 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 4T1JFP3xkLzbKw; Thu, 28 Dec 2023 19:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSJIHn9076012; Thu, 28 Dec 2023 19:18:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSJIHIq076009; Thu, 28 Dec 2023 19:18:17 GMT (envelope-from git) Date: Thu, 28 Dec 2023 19:18:17 GMT Message-Id: <202312281918.3BSJIHIq076009@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: f7d5900aa063 - main - sys: Style fix for M_EXT | M_EXTPG 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: f7d5900aa063c6e9d19e6372ba981fc76aa326a2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f7d5900aa063c6e9d19e6372ba981fc76aa326a2 commit f7d5900aa063c6e9d19e6372ba981fc76aa326a2 Author: John Baldwin AuthorDate: 2023-12-28 19:17:59 +0000 Commit: John Baldwin CommitDate: 2023-12-28 19:17:59 +0000 sys: Style fix for M_EXT | M_EXTPG Add a space around the | operator in places testing for either M_EXT or M_EXTPG. Reviewed by: imp, glebius Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43216 --- sys/kern/uipc_mbuf.c | 18 +++++++++--------- sys/netinet/tcp_output.c | 2 +- sys/netinet/tcp_pcap.c | 2 +- sys/netinet/tcp_stacks/rack.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 61af96d670d6..5125ad902c34 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -236,10 +236,10 @@ mb_dupcl(struct mbuf *n, struct mbuf *m) { volatile u_int *refcnt; - KASSERT(m->m_flags & (M_EXT|M_EXTPG), - ("%s: M_EXT|M_EXTPG not set on %p", __func__, m)); - KASSERT(!(n->m_flags & (M_EXT|M_EXTPG)), - ("%s: M_EXT|M_EXTPG set on %p", __func__, n)); + KASSERT(m->m_flags & (M_EXT | M_EXTPG), + ("%s: M_EXT | M_EXTPG not set on %p", __func__, m)); + KASSERT(!(n->m_flags & (M_EXT | M_EXTPG)), + ("%s: M_EXT | M_EXTPG set on %p", __func__, n)); /* * Cache access optimization. @@ -569,7 +569,7 @@ m_copym(struct mbuf *m, int off0, int len, int wait) copyhdr = 0; } n->m_len = min(len, m->m_len - off); - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data + off; mb_dupcl(n, m); } else @@ -611,7 +611,7 @@ m_copypacket(struct mbuf *m, int how) if (!m_dup_pkthdr(n, m, how)) goto nospace; n->m_len = m->m_len; - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data; mb_dupcl(n, m); } else { @@ -629,7 +629,7 @@ m_copypacket(struct mbuf *m, int how) n = n->m_next; n->m_len = m->m_len; - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data; mb_dupcl(n, m); } else { @@ -1070,7 +1070,7 @@ m_split(struct mbuf *m0, int len0, int wait) n->m_pkthdr.rcvif = m0->m_pkthdr.rcvif; n->m_pkthdr.len = m0->m_pkthdr.len - len0; m0->m_pkthdr.len = len0; - if (m->m_flags & (M_EXT|M_EXTPG)) + if (m->m_flags & (M_EXT | M_EXTPG)) goto extpacket; if (remain > MHLEN) { /* m can't be the lead packet */ @@ -1096,7 +1096,7 @@ m_split(struct mbuf *m0, int len0, int wait) M_ALIGN(n, remain); } extpacket: - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data + len; mb_dupcl(n, m); } else { diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 6016aa3b6ddc..8d863ffcf432 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -2087,7 +2087,7 @@ tcp_m_copym(struct mbuf *m, int32_t off0, int32_t *plen, } n->m_len = mlen; len_cp += n->m_len; - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data + off; mb_dupcl(n, m); } else diff --git a/sys/netinet/tcp_pcap.c b/sys/netinet/tcp_pcap.c index 49ab87d814b5..f26287bd7f03 100644 --- a/sys/netinet/tcp_pcap.c +++ b/sys/netinet/tcp_pcap.c @@ -368,7 +368,7 @@ tcp_pcap_add(struct tcphdr *th, struct mbuf *m, struct mbufq *queue) * In cases where that isn't possible, settle for what we can * get. */ - if ((m->m_flags & (M_EXT|M_EXTPG)) && + if ((m->m_flags & (M_EXT | M_EXTPG)) && tcp_pcap_take_cluster_reference()) { n->m_data = m->m_data; n->m_len = m->m_len; diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 8e374e28465e..10ab20f00e26 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -18455,7 +18455,7 @@ rack_fo_base_copym(struct mbuf *the_m, uint32_t the_off, int32_t *plen, n->m_len = mlen; soff += mlen; len_cp += n->m_len; - if (m->m_flags & (M_EXT|M_EXTPG)) { + if (m->m_flags & (M_EXT | M_EXTPG)) { n->m_data = m->m_data + off; mb_dupcl(n, m); } else {