From nobody Sat Jan 31 17:49:42 2026 X-Original-To: dev-commits-src-branches@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 4f3L466QK4z6Qc0g for ; Sat, 31 Jan 2026 17:49:42 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3L462yJmz3rNZ for ; Sat, 31 Jan 2026 17:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769881782; 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=xwtCLO7eRF3HnbGSeyCwmbd+53Bt3wR29kCAkJ9pGhM=; b=ilEwxm+8GduINTmdcHq6UMiXTQ5J+UTlPWurD9MVzeh3u0zTSGV/L051bboeKoVy1v7lB7 2qCcBrnoWVvcy3zAeajqKE0LTDlGrB5Ke+yFcBsjuH6ApJdNKPogBs5BUk3fVuuuEh+Lgn 05yMPjdFEsHXRbrBZofUH3H5x6Y79UUjpR+u9CuR4DRe5VxRs/jqBq/wg4Ou/9VfAyHyAu ICgWtJmiptNJkRmWm73OljnIpZaAzCJlZQ/TdJ7iy7z1z3HuSsK3XLEWxHnjUiRWK2YDtw m71ZscS7j5XAuCbZ+N7uZ+9X6p6rYft1x3hFGG+9MEwHKY08+d3nMHyXKR2/Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769881782; a=rsa-sha256; cv=none; b=SW4DZkmheUKYAa7tMSoYk+4jd5K4cZeeEULA6J2yP6Oi7Ff9pRLyFP/4dYXbJaE9FKmVJm GGbjzdy+ZiKZQHXvCQT4LyaKi5DBgIhlnIxh6uksyv+MqUfoaXOKMR5VREKjWYK56hdtl0 ZDYTleWXa+D5ua9VO4KwtOvtcHtvVQBzrp6zSWGnMu1D+vasnWkpV2UOsr67Twu9J2dSXC N6yMpAC1LD6D7RS51EtQXU1QJFKJq2RPjIlviRM0l/F7wfK1gAc2B63zpHjXUaoWRs/mhH i2F4k+FPqWH9TSfVyEM1qhdAOu/wVkjPu3+Qbrfld22lIDZxrrgEHgIdGibMag== 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=1769881782; 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=xwtCLO7eRF3HnbGSeyCwmbd+53Bt3wR29kCAkJ9pGhM=; b=BAUlAQQQUKuqan9ZTv3XE8DIp8tEEEmh2w+Q1Vc1wS1da6VXVV0ZweurrQflaBsfNwdghw OYKCC95dklxzY4KMqjtm4x68nhj9ITHzQ/3sslXOGfOFkXQ4s+TlzUOOnekfam2zm4dKhg Fm9NhfvQq2fy0Acx38q2A4sWDapoyRYoVhqhaj4vs/Lx7tdcnN7CLl/t7fJx9/AV9BOCqv ZWX2CYd+UnvKVS3ZjL8KwCEJl88mDW4h4ifehiGTMKOsahRXEatTv5EHCI/yiWQqyzTPtF C1IPNqU9i6v093IUxMFL1Ea4kuTEXftWyLRSOTL9nj749ru2yTnv9ioBk6D7RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3L462SHqz14Qy for ; Sat, 31 Jan 2026 17:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e0fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 17:49:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5b2a4d3481d5 - stable/15 - buf_ring: Rename some variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5b2a4d3481d56d376fd245d0a5545f3bb443953f Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 17:49:42 +0000 Message-Id: <697e40b6.1e0fd.2c41c32d@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5b2a4d3481d56d376fd245d0a5545f3bb443953f commit 5b2a4d3481d56d376fd245d0a5545f3bb443953f Author: Dag-Erling Smørgrav AuthorDate: 2026-01-23 11:35:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-31 17:49:24 +0000 buf_ring: Rename some variables The elements we store in buffer rings are buffers, so refer to them as `buf` throughout instead of a mixture of `buf`, `ret`, and `new`, especially since the latter breaks C++ code that directly or indirectly includes this header. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: siderop1_netapp.com, markj Differential Revision: https://reviews.freebsd.org/D54827 (cherry picked from commit 498fe07257aa75f0f1eb4639f4a6ae39fafda901) --- sys/sys/buf_ring.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h index 00870cbf3531..07a4fa52891e 100644 --- a/sys/sys/buf_ring.h +++ b/sys/sys/buf_ring.h @@ -266,7 +266,7 @@ buf_ring_advance_sc(struct buf_ring *br) * the compare and an atomic. */ static __inline void -buf_ring_putback_sc(struct buf_ring *br, void *new) +buf_ring_putback_sc(struct buf_ring *br, void *buf) { uint32_t cons_idx, mask; @@ -274,7 +274,7 @@ buf_ring_putback_sc(struct buf_ring *br, void *new) cons_idx = atomic_load_32(&br->br_cons_head) & mask; KASSERT(cons_idx != (atomic_load_32(&br->br_prod_tail) & mask), ("Buf-Ring has none in putback")) ; - br->br_ring[cons_idx] = new; + br->br_ring[cons_idx] = buf; } /* @@ -305,7 +305,7 @@ static __inline void * buf_ring_peek_clear_sc(struct buf_ring *br) { uint32_t cons_head, prod_tail, mask; - void *ret; + void *buf; #if defined(DEBUG_BUFRING) && defined(_KERNEL) if (!mtx_owned(br->br_lock)) @@ -319,7 +319,7 @@ buf_ring_peek_clear_sc(struct buf_ring *br) if (cons_head == prod_tail) return (NULL); - ret = br->br_ring[cons_head & mask]; + buf = br->br_ring[cons_head & mask]; #ifdef DEBUG_BUFRING /* * Single consumer, i.e. cons_head will not move while we are @@ -327,13 +327,12 @@ buf_ring_peek_clear_sc(struct buf_ring *br) */ br->br_ring[cons_head & mask] = NULL; #endif - return (ret); + return (buf); } static __inline int buf_ring_full(struct buf_ring *br) { - return (atomic_load_32(&br->br_prod_head) == atomic_load_32(&br->br_cons_tail) + br->br_cons_size - 1); } @@ -341,7 +340,6 @@ buf_ring_full(struct buf_ring *br) static __inline int buf_ring_empty(struct buf_ring *br) { - return (atomic_load_32(&br->br_cons_head) == atomic_load_32(&br->br_prod_tail)); }