From nobody Sun Oct 18 08:13:30 2026 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 4j6rzG6fKrz6jxcM for ; Sun, 18 Oct 2026 08:13:30 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j6rzG4jHDz3LGg for ; Sun, 18 Oct 2026 08:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792311210; 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=5TM+ZrAZYhYDmGKQ4oKfYtE8OaXFeHI/ImDTCi0zCHA=; b=jIyB38r9Yrsvsm/eHanMoIoZsMrdRcfu0dsLZ5U0MAtXALy4G80AZzN+GKXqb05ATMmoDC 89TkRxxZEM8TkQ4yI9QYHZHX9ble19PzJGl9J4aoAkznaNa9E/L3XiQhgIc5lkFGAASkrG dDi2n4cNG8CbSvMShyBnQTz2RTidFvTqhpThXG8LiHPDzyOR4ig3KWsKL/F6wTlu40veEz jfQub0e46zQec3QnqodYWlz7FOn3wJzuJSU64vLaspiKhsa+VUneEuCFtzu3Wid+vtwgwR Ara+9GG+0FvHWDB5s2iJeF2gFrv08LmwM2zM6w2Va48bAQi3+TeDnzkBwEvKCA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792311210; b=khaVNR9viK1nJqQxGzwysYyoFqFQF0lDHEprjd5DJXZkIxKgUVV8uBfJczuxe1w37KFXyg H4xRaXZT1e2lHVNe0uS8Zu0WjgIiF9yvxsL/c2jXgwSV9Ya1Ri70Dr5Nr4YmkjhGprmRgb /ACQIbnqxkGtP6bGGheGyGxtMjn4yL0KYIGUbrVN+XCpuToWGf+kihI2DrXfbIg29e5mmS OeOrhQFrZCHayVKkwge5+JMAue+e3b88sg9AlcHbf/xk3imFR8VwHwIqdFfJPjtMZ6+90X pxPh0a5s49QAL1bkc4pcYdwMtU0GAVF9dtN7KihS6b2nrtWJVWzCDrLhrlLY/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792311210; 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=5TM+ZrAZYhYDmGKQ4oKfYtE8OaXFeHI/ImDTCi0zCHA=; b=gz67iumrNWS+qzLS0Lipz8QKDZEwzlVS0WMZsCQN7d9p6TxBc5wLnMFLyi0YyeMzvIwWUr mrdAxTQ7kQyS2p7pOwfRwjRsTX+tKYHVAVBoQXqcgS7muuVzFlIEAyWhDU3MT1Wn6/HkBU HNUWad+o5tKQgWTYFpTvJIXGW8PMFajYkPuOQYlKCgfwyQfS5gdKQsux8TkbLvCfT8Mmi9 NlZUjgQe1wAJ3btI7I0vFDsCRfdvVaF5+s98v3cq08125OIcQvbx1t3wAuJIzpKYaCeeOR 9hph/vCjG1qOeJLOBLKg9IJ0S6QF+WSRo8bmRAyFhOYYFh3WijmgxP9JJKsn+w== 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 4j6rzG4N8fzjBr for ; Sun, 18 Oct 2026 08:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33238 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 18 Oct 2026 08:13:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 4f4531be5e97 - stable/15 - sound: Remove unncessary locking in sysctl_hw_snd_hwvol_mixer() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4f4531be5e97530bbbc610d6b55a80f2831eaca3 Auto-Submitted: auto-generated Date: Sun, 18 Oct 2026 08:13:30 +0000 Message-Id: <6ad47faa.33238.62e86f0d@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4f4531be5e97530bbbc610d6b55a80f2831eaca3 commit 4f4531be5e97530bbbc610d6b55a80f2831eaca3 Author: Christos Margiolis AuthorDate: 2026-09-18 18:18:13 +0000 Commit: Christos Margiolis CommitDate: 2026-10-18 08:10:49 +0000 sound: Remove unncessary locking in sysctl_hw_snd_hwvol_mixer() The locking around strlcpy() was because of m->hwvol_mixer, but this is just an int, so we don't need to lock in this case. Instead lock only when m->hwvol_mixer is written. While here, add parentheses around the returns. Sponsored by: The FreeBSD Foundation MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D59109 (cherry picked from commit 044ef293a8bbd057de3fb13ec97d3d0ee16462e4) --- sys/dev/sound/pcm/mixer.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 7140da04e701..ff591cef799f 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -698,22 +698,16 @@ sysctl_hw_snd_hwvol_mixer(SYSCTL_HANDLER_ARGS) struct snd_mixer *m; m = oidp->oid_arg1; - mtx_lock(m->lock); strlcpy(devname, snd_mixernames[m->hwvol_mixer], sizeof(devname)); - mtx_unlock(m->lock); error = sysctl_handle_string(oidp, &devname[0], sizeof(devname), req); - mtx_lock(m->lock); if (error == 0 && req->newptr != NULL) { - dev = mixer_lookup(devname); - if (dev == -1) { - mtx_unlock(m->lock); - return EINVAL; - } else { - m->hwvol_mixer = dev; - } + if ((dev = mixer_lookup(devname)) == -1) + return (EINVAL); + mtx_lock(m->lock); + m->hwvol_mixer = dev; + mtx_unlock(m->lock); } - mtx_unlock(m->lock); - return error; + return (error); } int