git: 4126c3ae4f6c - main - emulators/open-vm-tools: Unbreak build on CURRENT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 22 Dec 2022 16:31:20 UTC
The branch main has been updated by garga:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4126c3ae4f6c876a2fdc4fd359c633cfe9e342c2
commit 4126c3ae4f6c876a2fdc4fd359c633cfe9e342c2
Author: Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2022-12-22 16:29:28 +0000
Commit: Renato Botelho <garga@FreeBSD.org>
CommitDate: 2022-12-22 16:29:28 +0000
emulators/open-vm-tools: Unbreak build on CURRENT
Fix build on CURRENT after NDFREE retirement
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
.../open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
index ba54239caecd..76f88443fd98 100644
--- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
+++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
@@ -1,6 +1,6 @@
---- modules/freebsd/vmblock/vfsops.c.orig 2022-03-04 21:01:24 UTC
+--- modules/freebsd/vmblock/vfsops.c.orig 2022-11-29 21:17:22 UTC
+++ modules/freebsd/vmblock/vfsops.c
-@@ -171,14 +171,22 @@ VMBlockVFSMount(struct mount *mp, // IN: mount(
+@@ -171,14 +171,21 @@ VMBlockVFSMount(struct mount *mp, // IN: mount(
* Find lower node and lock if not already locked.
*/
@@ -11,11 +11,11 @@
+#endif
error = namei(ndp);
if (error) {
- NDFREE(ndp, 0);
+- NDFREE(ndp, 0);
uma_zfree(VMBlockPathnameZone, pathname);
return error;
}
-+#ifdef NDF_ONLY_PNBUF
++#if __FreeBSD_version < 1400054
NDFREE(ndp, NDF_ONLY_PNBUF);
+#else
+ NDFREE_PNBUF(ndp);