D55539.id.diff
No OneTemporary
Actions

Size

762 B

Referenced Files

None

Subscribers

None

D55539.id.diff
View Options

	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
	--- 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 @@
	}
	#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);
	}