From nobody Tue Mar 10 11:43:35 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 4fVX880d7xz6VWF6 for ; Tue, 10 Mar 2026 11:43:36 +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 4fVX876SrMz49cf for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; 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=oqWufFMpVBsB33fsbFrYQfWa/1wmDvgZ5qENSSVkfEQ=; b=oIlVn3v7G7G8liJdGxyv5Q77obPcF+4KBeW3lQVyFp6IsJuIDBDUd5t/nVingJ+FnGMfqw YyLvatCytroM0cSUOSX+u5Qj1+9BSeB4IaIbTJ4fcEFHxOXoOlkI1TEa2gBfKzDFQHy8v+ KWfRQVevvfqH8Wi9C4NwNCSnkFHebtzvw5heoF14dV4FPmE5T1/X9bVi+8Ik+610eSHszA K64YvnT36rdCgLIpwBbk8UPEgA1070pQkuD+F9EOZnUaeSaAXiqwzNrlMCEBtFYvk+xZr2 Xzd6W3lnGxMSZqf5GvEKt0Qzb+26v8/vgKKEWzbpkZNUKQnFZ3a68UVQW2vc2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143015; a=rsa-sha256; cv=none; b=OG8srDnDUJuddTn9gZmt1n4yrsUfLyAQifo4eEzvsuYYyBS3jOaQdLzirVk/0lWtBY8Km8 RQ+4n8YvRtm/8tC20A3mI8GSk/AvcAM/uErgSgXO10vdGOE3vKdatPV3dwiJdt/B6qlekE 4QOOe6ktw5TjULj8Hyra0V5ggdQ6DYmyK+Q15NGxenjpCVUKNZcmGenrrf4KW0yijrudGh lQ7tSq2QLXUVLZ+T7tls2KKSubMiFZ2qPI+7XGmlwHQ5Rk/36ebizHohnLusGHv0I8QB9x 1r7BExtSV4dIy6WLdVp1UcjQAO+45j5IpnyPRr5uTzAsazn8QSzGhBj69loREw== 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=1773143015; 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=oqWufFMpVBsB33fsbFrYQfWa/1wmDvgZ5qENSSVkfEQ=; b=Se8KcXab6bOJfP6C18kGFiA/FSJbvMLoV10McbNdqeu4rAzLwlKnK/DS382rarpGbU2xNO frp+MXVLez6wDlA/X3lRI3EfjsyedYRd8vYQ7xI6/m3phj7breWcodkeJXafxBBjAZ8V8L YrIGjo53U7lCQtNSUeB9a2xBoVP3WlyWPEH4zoJ1fLCu38t92fp/WcawRZ0ZZJ7GgI4vbg zMPCxszcBslOlBFtLWOCK71AuwJ2xtlZr8zKGPhFrnJ5XKz/CQFCd29fKcnOyLzZCDj1PL aaX5ubBVPIWOUXevigZdnvU0iOWEcn5uEwgRUOmcYHaHzQObBB+bV7NrnkQu2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX875x8lz195P for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0b0bbdac18d1 - stable/15 - zfs rename: properly cleanup on errors occuring before zfs_do_rename() 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0b0bbdac18d153e365e20989e23636d51214f972 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:35 +0000 Message-Id: <69b003e7.1be4c.68b43bb6@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0b0bbdac18d153e365e20989e23636d51214f972 commit 0b0bbdac18d153e365e20989e23636d51214f972 Author: Konstantin Belousov AuthorDate: 2026-03-05 02:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 zfs rename: properly cleanup on errors occuring before zfs_do_rename() (cherry picked from commit ed87040311b88e2c95a791aa049f2c37c857f048) --- .../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 42565b579de7..7ea6f119130b 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 @@ -5518,15 +5518,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); }