From nobody Thu Jan 18 22:39:47 2024 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 4TGHkC56DJz579vc; Thu, 18 Jan 2024 22:39:47 +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 4TGHkC3znjz4Fv6; Thu, 18 Jan 2024 22:39:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617587; 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=QooBTnnmHHzhpbhScFkVivlpZxn2kSU6oEkhmKL0zg4=; b=qf3QgRoTiAVx8sLjDwlVvNfp/l+E8peE//Zq59t7hBwT0QVtiGYIrTDu29zi80WoDttudQ GTGdIDktBAoAanihntERE3YI5ZqBlh5svk/6fYwCK/8KjDm1jpY9u7Zyxq8kzkjy5ecJY0 OO50Fvisnx1NqR0FNlJdhuYxtNLPjgmk5oxhTAvI1F0o84srRWUlCVFgnp7a+nQeaL4M3O wZ+fwYNDYth2uS2LF3CEEtH2sTZvAWZi6Ku0hBjRTp9vegNPErvDoAKDBo3dGqqYFOukty qXWh9fH8SZ3yi9VX3XUuptIlKzMThCVYQIUCxts2IvTGra3hfOpPlsiM5bh4GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617587; 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=QooBTnnmHHzhpbhScFkVivlpZxn2kSU6oEkhmKL0zg4=; b=Q3ijOsrZnepUlezzcB47X8jDIUIkSG/GjN/bflarHbjy/IBFHySZ5K3x5I1qIgpjt494fe 9JRim74JQSimNGNpxsao+pCHkCAgr3CEkMkUf3htWBcyEN9/DnghVVhGNNJu6X6Xkk02tz Bsnn+fy+wldnyQ9hXPMD7G/OWI+xeKAo1GosCCf9ubGw5kRQ6xyX9f3MwpH/+LOHiYjbox uOF5bKNJ6CDTxITSZYy2t+PNTSx1UAWiOwNmIE70v4uJPZGg4M1X43EszhUQAtuv1lJvbr KAEeW5oZiENo9YIaa2bPAsqolSieZVrAOUGYXGtElUB/Z8RhFh2oCFNw8kEEjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705617587; a=rsa-sha256; cv=none; b=w9dz/0X8zaHqsPSaq+HD6tgAXpdqMehD+5CDE8q6zOF1uVRCUUkZIcO3gm21QUxPZqWhIa oIODCza8hAYwXzikQLY8wEGfzuV4VF2qrwZbl3yvFe1XdaxQGVh/liPIg2l4MebUBt4ZF9 g+VhdfWAqlFU+5vuyy8griO+rzaPjGTPGBCprPg8GiSFf7qoRWVd6sW+p07dJgDeweellJ yMjATtssyK0JyvvD81Q2kgEVLsEyY4AeX21MKUlux+W/atIi24gE6c40OTgJ8dUPzYCM7c rA8lEQOOAZhch4u4puDHX+2gFYUFijrpqXhnG01KDd4jDDWuBEnT/vjUKY0/OA== 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 4TGHkC2wPHzQqG; Thu, 18 Jan 2024 22:39:47 +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 40IMdlOj009276; Thu, 18 Jan 2024 22:39:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMdlF3009273; Thu, 18 Jan 2024 22:39:47 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:39:47 GMT Message-Id: <202401182239.40IMdlF3009273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b1f42294456d - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: b1f42294456d7d3cb3724e1a9a79c0a89a51c24a Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b1f42294456d7d3cb3724e1a9a79c0a89a51c24a commit b1f42294456d7d3cb3724e1a9a79c0a89a51c24a Author: John Baldwin AuthorDate: 2023-12-28 19:17:59 +0000 Commit: John Baldwin CommitDate: 2024-01-18 22:35:37 +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 (cherry picked from commit f7d5900aa063c6e9d19e6372ba981fc76aa326a2) --- 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 3c77b3eaf229..6d22e8e918a4 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -202,10 +202,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. @@ -535,7 +535,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 @@ -577,7 +577,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 { @@ -595,7 +595,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 { @@ -1036,7 +1036,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 */ @@ -1062,7 +1062,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 834bce35f5ba..ba559500552b 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -2103,7 +2103,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 1fdb039e00e3..05d0de6493b3 100644 --- a/sys/netinet/tcp_pcap.c +++ b/sys/netinet/tcp_pcap.c @@ -366,7 +366,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 c3a24f4c19b6..3e3900844989 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -15102,7 +15102,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 {