From nobody Thu Mar 5 23:48:16 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 4fRmSc3ptSz6TrfG for ; Thu, 05 Mar 2026 23:48:16 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fRmSc2Grcz3MN9 for ; Thu, 05 Mar 2026 23:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772754496; 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=I/9mLdzNdS35cOGdYQpRy1rFftUahVMJWUJ3jpsuhmM=; b=X8SMmdOFOBp5rnSqC5GkD38ci2ST+1zlf1/fAKfnuffV8hpmQnSvUfdIv3hpmEH4LlpcwO YUZgVAFebjsCf8XnxkxG64NyVJBBvZoG2xXomoG6LdyZg8hFWmoHg+odt7CuXWMpZj9o+M vMxtWnFG1xBIYnDOEjVFzklCeRM7mr2ytLDzLIOmbuCFRmPnt+a/BT364u5mwfyN2IGvZj e/vsBRlm5LJ9yUqIuP/Weazshg1ilY3y4FIoxAq0VzZozptaHtQaR/4tybACHOct4vNUe2 6xxwBQmoq7xTthRaHFapA5NzMnmNw5sLDfVS5s6zmq/JYjxgCpjw6fjfXaeevw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772754496; a=rsa-sha256; cv=none; b=HWA7G76EqV9kmUbSTrof4id82V4bGdGuVVaZ5B/pGQQX4Xct6D6+8h1hKtG+SnUQvJ7Pz/ wz0obt1f0i+BSh7G6s4tjYK1l15JNIySKzA4en0pS6kjqyL/7Sj3vRNUDcQE3+aDplON25 Ji+2tb86al+od/sh3IqVWrnEd8vkmf11r/K7dR0JfBbJJxHhRV/u+oUlr1Cx8P0FU5bGI2 FLGx15ONdul7zaZMU2vC3l3raioNG+98yprSOOKUWPhxmAho6aliJswO56Tuy7s9hHuh9H bkj/Ctr2o7zabs2052ID7y9Kj7n9Cieu2kKzYMDDM4qskitYmUwg7J6VQi69ow== 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=1772754496; 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=I/9mLdzNdS35cOGdYQpRy1rFftUahVMJWUJ3jpsuhmM=; b=IIgtP3snxVKi3gqXElGmHXvJXFnNVKLG6nhViuV5nNt+50fJ4ZoOTMMEfLHZ7BhJFXmg70 +T05GXFSYl5nTs6iK/LBfBaH98c9IQYRgGL0T1tTgbCdarwQhjtpHJsQi/v+s20qk5cqBF GoVbkZxRn6P29EKHg0vpKBZplUZdlTI0i0ptxkl3w1GZkiuf6ET5ZhlaL06GiB17st3PXP v6WfWhnXpq2LtL5PRs6VKWeZEnSIgj86v3kNWfPq+uTLqs9uU7jg0CheXsdh4WL8kiliyf Nn3UhgOGLbkjhQs50BNZgK572Y837xH3xtg7aIXQS9b8IMWnE7VGCJtHFG6/Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRmSc1blTzyZF for ; Thu, 05 Mar 2026 23:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f286 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 23:48:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ed87040311b8 - main - zfs rename: properly cleanup on errors occuring before zfs_do_rename() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed87040311b88e2c95a791aa049f2c37c857f048 Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 23:48:16 +0000 Message-Id: <69aa1640.3f286.50f64742@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed87040311b88e2c95a791aa049f2c37c857f048 commit ed87040311b88e2c95a791aa049f2c37c857f048 Author: Konstantin Belousov AuthorDate: 2026-03-05 02:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-05 23:46:53 +0000 zfs rename: properly cleanup on errors occuring before zfs_do_rename() Reported and tested by: arrowd Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55539 --- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 05ac77741d4f..31654ec82392 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -5527,15 +5527,24 @@ zfs_freebsd_rename(struct vop_rename_args *ap) } #endif - if (error == 0) + if (error == 0) { error = zfs_do_rename(fdvp, &fvp, ap->a_fcnp, tdvp, &tvp, ap->a_tcnp, ap->a_fcnp->cn_cred); - - vrele(fdvp); - vrele(fvp); - vrele(tdvp); - if (tvp != NULL) - vrele(tvp); + vrele(fdvp); + vrele(fvp); + vrele(tdvp); + if (tvp != NULL) + vrele(tvp); + } else { + if (tdvp == tvp) + vrele(tdvp); + else + vput(tdvp); + if (tvp != NULL) + vput(tvp); + vrele(fdvp); + vrele(fvp); + } return (error); }