From nobody Fri Jan 23 11:37:31 2026 X-Original-To: dev-commits-src-main@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 4dyGBM5Rj4z6P5KH for ; Fri, 23 Jan 2026 11:37:31 +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 4dyGBM4WZwz3b7W for ; Fri, 23 Jan 2026 11:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769168251; 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=et1JM1HIMUgtU7MlUyIW+VjLG5iVnaZ1GBxdR9C53oc=; b=rzO2j/rnDbqNGYItFQx2pErUZhbfJeDH+UFoUltn0UiCAGmA80vzGsZDgKroegOQWsmP+5 ztE1INKivxh94klcMuZY38MLEVEZmBBxZNzJ1DvGKoI82QMK9KhQiU3qFRvCMRz18FIPgU S4n2F4lNPmAb+eC0tq8XsxFS/kvWhNbLVqBZZL797mBSeKfEtm7o/ur1cZ5KRABe8Jcpca HCjJ4WjXUFmOBFrEkWPwv4RomBgo1fIwMN0+C3U+Z8H1vZHPJKVYJlwEh/tW+NBVS3bpzf xjQymzxqwbCW4jEb+kq/Q4dPMnFuTN67Tja+lzNF0UC5Qypu4mrDM/dSLOySPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769168251; 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=et1JM1HIMUgtU7MlUyIW+VjLG5iVnaZ1GBxdR9C53oc=; b=ezSPSky/2sbS0k749D+cEpGjAps91fRTS52TCnUmyekNpIXSh/e7/mjP6p/j0/tFbYwdNm sY+QX3ruJM5hXr+oF7Zo9bxLkGNtsRUtPOqD1kVDj/CjxQ7RosTgNRfak7t5/5x9A917Q0 m+6g7XXXy7D8n3ce2OzxFRVKPEEvJfw+wbbOGauCDEerR9EL7Iv9sRCOHiOkdvTlTp4pnr hlO0czYnAXmAOQngbkg/SXNFRr71ziB7qQ/qiDZbXL+ZqBwhbTfUTPM/dylXpzdO0HCxKk uKBnH8S89VuUxrqbXgisXxkqFo0dzkzZCRyfg3kt4kBO9Y126r+9FRMMO5enTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769168251; a=rsa-sha256; cv=none; b=o4UOd8KXEMajJgC4t2ZXb9NBxhodPKZwkpK8Ne3tfKD/malmRarZvOz7Y6Yh1pT6P+Jxvj NTbA7Gp0umPYqN9C+gcsK/mbxrCERFX2cIT+u1LjTWN9MTUvHMiWAFzSLzsuhpK/8EWXtA Y5ZnQI3PS+9o3NT5gK9M6PADcP9NXzVcd0S9/3Ozcj3QRGZ6idd0ns+oHFscPycgbaXgyh lLyYkR0Bz0xUHdZndEliWOThCPXi0RC03o+2XcfnkxIg8Esa77R3Y/RDtHlptXwJ+Sp2px mo7t7xfadZeXYPmujXk819ywU/IE3OxLOttbO56p6xLvQukAAZea/70FOnJHuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyGBM3HNtz26b for ; Fri, 23 Jan 2026 11:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 11:37:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 498fe07257aa - main - buf_ring: Rename some variables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 498fe07257aa75f0f1eb4639f4a6ae39fafda901 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 11:37:31 +0000 Message-Id: <69735d7b.3e9f8.6b24ae7f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=498fe07257aa75f0f1eb4639f4a6ae39fafda901 commit 498fe07257aa75f0f1eb4639f4a6ae39fafda901 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-23 11:35:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-23 11:36:21 +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 --- 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)); }