From nobody Fri Sep 18 18:18:46 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 4hmgqW2JxMz6spNP for ; Fri, 18 Sep 2026 18:18: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hmgqV5LNZz4Np6 for ; Fri, 18 Sep 2026 18:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789755526; 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=G2tyAZrToPaeJ37D1rawTN1yIyfiLDJZy4QhpXSZS6A=; b=DeqKPVNPTre7Rmw63islR7iYfVidYlJy7I8QWjLyjIgFGJGUbNJxFzlrK8m8kFWtueK4GT KpbDsDv12ar2efY810L60KUDOMNUGuOjlvOrewCUNBx8sYjQUDn3SOKdjbU6VaeZXLMpRr EOYgiMr/sGxgbC0ZFdprYxeqj4h7ALhynDAOFyqgYGaMYRt/NDs6bUcNXQxW7qPz+Cb0gJ Cfkyoi/eHSgqfqaqLHR0ZUbrtN/4t9BQBYrO2aYWVf5xZu9nY23cJOa3S6o5Z/LyA31R9b Qj+IwIrXq2euuCT8Mu7W1bdabIh0QEE5pecFXmzgkpojtXEaUys95oQY7w7XEg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789755526; b=KzSBKxDGmmQ2Qw7fLYCHZmdL6qljdFieFl3pT2mpnLmjfeiMcAWpVNE3p9VxDin6n25iZw JVs39VcD9HN5nUTF+4myB5grDqFz18JrqYSbG94aHn+iO5Db/gAwVJ9cqU0X6hLb+uknAS x/GB1djCVtSl3AV//KWbnmyAm7g7spUVtd7z+Tjlmiatl3g8Tfkw60XX0bCSSU9z28+sRq zftW5ZG58jv+8ej0ZNYHbLAobOeGBvb6qAbHkTEDaLkrVl8X7Mb3akoW55+Wm9l4j9Fyci DAyEcoiNhxCy1IEg0mGlKVo5ipVRGKMUPkYDy0Gl/xVDUMhciECvVJLjfWSSVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789755526; 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=G2tyAZrToPaeJ37D1rawTN1yIyfiLDJZy4QhpXSZS6A=; b=xo4BlbLxg4QRECwLctatH+UpJBJGgriou/aaGc1J/oTriOwILMJ6pOEbtJcR6ZtOViQDnr DOdg+Y9slfs/nHWKE1S70kStVkomlGws9rLg627UAXs+/gLAIOIKMxfCQ5+MELoZ7XSWBU TVQgEOBVuHCLKP7L8m5axdebdEjizUq0vld1xMX+Q8b6qVe5349wtYxxpksm5rfmbTwB3h dgKGWRHRqAvJ3eI4E9U5Z+zqLGJRdfvv+O1kHjFoOSaMnZSnSc5y+TJm5pCEMUhss3pQZY qP69+Nfl4UUDMEcV1nXogLZQGYFgNr8PcFOUhIbkB+0F/JIsJq+usW+b6VfefQ== 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 4hmgqV3nGXzV3w for ; Fri, 18 Sep 2026 18:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 18:18:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 044ef293a8bb - main - sound: Remove unncessary locking in sysctl_hw_snd_hwvol_mixer() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 044ef293a8bbd057de3fb13ec97d3d0ee16462e4 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 18:18:46 +0000 Message-Id: <6aad8086.367ac.27b6b15f@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=044ef293a8bbd057de3fb13ec97d3d0ee16462e4 commit 044ef293a8bbd057de3fb13ec97d3d0ee16462e4 Author: Christos Margiolis AuthorDate: 2026-09-18 18:18:13 +0000 Commit: Christos Margiolis CommitDate: 2026-09-18 18:18:13 +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 --- 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