From nobody Thu Jan 18 22:39:40 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 4TGHk50g61z579vQ; Thu, 18 Jan 2024 22:39:41 +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 4TGHk502jNz4Fl2; Thu, 18 Jan 2024 22:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617581; 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=PZBNBtzdLSWIH0/mnofo/ChHrPfNASoRFoU7BVRGkOQ=; b=Poq4FJaLFnHI8GmtpGxkU2bYypZM5EtEXH3M71A3RGGTJ+9G3JVCsUSi/nZsGReKO/ovBi L3AwLbx2YqJAxUnTQPDwLTUqgNp7FPa9RrR2yxZSJA8TESsOgbigGvchRUXoYCei2SWmYn k8bFgWa+YFlFM1q2Us8UeES/PZlVWeTrK1mBJrjQgScdjMTnXrWherUhcMfjW9gYlf3zni LAUopYocuWq2xzuF14JeypoFxMd+zrvKSY63spb7NUHF3XJ9eRzL3VxGzlUwPVLjlinV20 PGpWq0HcPWRYnVoaBlzJmqiQRiIYsEGgplxAzkdm6ErPkzoLD1ZUm7DllFJLzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617581; 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=PZBNBtzdLSWIH0/mnofo/ChHrPfNASoRFoU7BVRGkOQ=; b=K9vJ6pmUUDH4sPnRMLjyhpRq3beDdTi0WCHYZpV760VULNCdoeywDcbqfKVO78YK79CLKu vhNskUizzPaleCxzmmEE5ysZjydy6yC+YuP8Ios/0pGPd1Krp0OliRq97SUJO4R1pM2gpu LkLHheQwBYJ7xFlCOfdyjHvUkhV83TI9wOUYdFdLYY70rT9SgIBtwdvd0ZOUaw3gKyMwO5 E6gWj9l4aah7Ys/50CfUqxCm/0W5kLvxMBiPyqSNuYd50TTLxchTN3G6ojQeV53QSK6vgL yJSD/gRDez/YT+SzD6FsjDOzvF2MM2GQtyVPgg1SknU9qfR9ThWm4/J+MtQ3vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705617581; a=rsa-sha256; cv=none; b=ttAR4+KG2xqRHgFy1hWYSM+bh/PDxiBr6cHsMhd+6/z7HwB6Wcy/BbD3y1dgJAzr39ONg/ vEIFD2IUPxoal2SdLO8ctFJU64eOlYUPkPD3SMJi4lgct/uMBJ41LuB8U0JVnOujwxTl0e dtbDEBHBKGTike5G+QCGzDAAbAxWnE1C0veUBR+UmXh139csINr0HKSzcA/SyQF7O3+t01 CYgmG9Zl410piKbn2z3oCIaKnZAQP4zwrYmkzc8/k/RrKcZ4YpqgJf7E3rVzXpPRS9nSXh 7B6+ZCU5CX8cBB3oCrszb007s/qioiAHP3Luby9tXdQwAMYv0PN4KH3USae3zw== 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 4TGHk46F3GzQnW; Thu, 18 Jan 2024 22:39:40 +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 40IMdexZ008910; Thu, 18 Jan 2024 22:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMdeP6008907; Thu, 18 Jan 2024 22:39:40 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:39:40 GMT Message-Id: <202401182239.40IMdeP6008907@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: e000bd2551a3 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: e000bd2551a34ae1513e90ebf258f523048584d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e000bd2551a34ae1513e90ebf258f523048584d1 commit e000bd2551a34ae1513e90ebf258f523048584d1 Author: John Baldwin AuthorDate: 2023-12-28 19:17:59 +0000 Commit: John Baldwin CommitDate: 2024-01-18 22:35:14 +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 ff934a7a8585..f1e986eaa348 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -238,10 +238,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. @@ -571,7 +571,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 @@ -613,7 +613,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 { @@ -631,7 +631,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 { @@ -1072,7 +1072,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 */ @@ -1098,7 +1098,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 549218badcec..0d9fd8136554 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -2091,7 +2091,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 db8131ffb377..354c644bec18 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 {