From nobody Mon Jul 27 17:33:33 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 4h85Kp2KGrz6nHtq for ; Mon, 27 Jul 2026 17:33:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h85Kn6pQFz3KZt for ; Mon, 27 Jul 2026 17:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785173614; 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=IFOjaJcw1e1p+PogtvOFPYZR4GrpAXTWsEtxedyf3qs=; b=pgiaj57FBicqMCzuMlG2DMrdJjq7CTwVToqYsCAqU4cnxxkVco3GZHOHPjKPglcJ/Bre1f 7TQhLTbCZB8WJMZhJvQ7X2c2lyzVufDRyIogSmvrdvk+3J00jbht4Fa1wpHhF95mK+YOTT DMvxvMHyM81ERvcdK1p9rcJht0vsN9WXxNnMJcisDIoX3/bG4uncR1SP65meiMvRFh3SLT yX7E5uAiW4P6NHlRYXl++aIjq9tnuVUJzGCOT8cftrN25DuYA6TqIFEko21sdv/Zo8+mf+ XRZBvDQBH/tZgtnjsfiTS3TdLZYF0D2s4h3PA0w2VuLFsBwSfFQ59BzGiUlNpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785173614; a=rsa-sha256; cv=none; b=nT3+sYKDKR2+gfOCmHQAtZ0+fb12uE93TqWH24qWlUUwS8NlZ8I0GRUFp9tyOPZQpptqD0 iJ3msH3bMIuFNzJIBAfxi1GG6bukOTOFfkJ8HHZcAYqj7C29wXlWZJO3d1p64GVG0q/b1K sbXgD06CmtCtoufl9GsoJ4aeiPUoqcGbY1xFvGJHFe5g7qTfSZDtJ+rmoD3xqsyj6SYv/m +NU8jxrtnzA78Uayp0Xl4LBxFYnL1l9kMClDyrf7ysLDuU+dwQQrYvgoS2fRRiiK+QJlS5 yWGWkhUYKog3moGr2DIy5/3DhIrMyNqNJOvsGmQ2cFiGiTEQdNYX40isBXur6g== 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=1785173614; 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=IFOjaJcw1e1p+PogtvOFPYZR4GrpAXTWsEtxedyf3qs=; b=pmGnF6AwrXXOfKD3J7uPt+Mh5+xAEyytBW4w7mOroiC7ewP4M2M6NsDHMzx6/nSZ308RWR G7b1TVg+2n3u1ekfohvvtNZQeUX0KHIrIHQK/gNzPkfsfQL2ktGp4IKcOZOgzfXKLO3YFV rHjsMUnVM3iF3k/Kvn0ao1pyaeCXdFDrKGNLALhxw+8qHD8HqFbNkuLZoZCSrLOMf6uBCk oTotpm2tmxunxAok1zlnnR9KtJs/LEwQ2ZRJHYo7fYrHrHmjHI6/UATr36/OaVTKZDi1k2 567Qu/UgC/rPFwnN27zRXsNZ/ONDuEV3CFJMBswZxXOl6Ej6naoct99gu4WKBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h85Kn5lH4z1Hkg for ; Mon, 27 Jul 2026 17:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2554f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 17:33:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bde29083d059 - stable/15 - zvol: Hold the zvol state writer lock when renaming 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bde29083d0590bd55d0726405a81169109b1265e Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 17:33:33 +0000 Message-Id: <6a67966d.2554f.1286ac25@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bde29083d0590bd55d0726405a81169109b1265e commit bde29083d0590bd55d0726405a81169109b1265e Author: Mark Johnston AuthorDate: 2026-02-09 14:54:44 +0000 Commit: Mark Johnston CommitDate: 2026-07-27 17:29:03 +0000 zvol: Hold the zvol state writer lock when renaming Otherwise nothing serializes updates to the global zvol hash table. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Mark Johnston Closes #18191 (cherry picked from commit d7b8eef9d281f6831ac7d9cb27362509ec434fb2) --- sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c | 2 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 2 +- sys/contrib/openzfs/module/zfs/zvol.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c index 2bc85e9bd972..5be153a90ec5 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c @@ -1250,7 +1250,7 @@ zvol_os_rename_minor(zvol_state_t *zv, const char *newname) { int error = 0; - ASSERT(RW_LOCK_HELD(&zvol_state_lock)); + ASSERT(RW_WRITE_HELD(&zvol_state_lock)); ASSERT(MUTEX_HELD(&zv->zv_state_lock)); /* Move to a new hashtable entry. */ diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c index 89f9bc555fcf..dc47ff20fd74 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c @@ -1796,7 +1796,7 @@ zvol_os_rename_minor(zvol_state_t *zv, const char *newname) { int readonly = get_disk_ro(zv->zv_zso->zvo_disk); - ASSERT(RW_LOCK_HELD(&zvol_state_lock)); + ASSERT(RW_WRITE_HELD(&zvol_state_lock)); ASSERT(MUTEX_HELD(&zv->zv_state_lock)); strlcpy(zv->zv_name, newname, sizeof (zv->zv_name)); diff --git a/sys/contrib/openzfs/module/zfs/zvol.c b/sys/contrib/openzfs/module/zfs/zvol.c index 185672672a2f..67ba68aca83d 100644 --- a/sys/contrib/openzfs/module/zfs/zvol.c +++ b/sys/contrib/openzfs/module/zfs/zvol.c @@ -1780,7 +1780,7 @@ zvol_rename_minors_impl(zvol_task_t *task) oldnamelen = strlen(oldname); - rw_enter(&zvol_state_lock, RW_READER); + rw_enter(&zvol_state_lock, RW_WRITER); for (zv = list_head(&zvol_state_list); zv != NULL; zv = zv_next) { zv_next = list_next(&zvol_state_list, zv);