git: 30dfe4eba542 - main - emulators/open-vm-tools: Fix build on current
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 20 Apr 2022 14:56:33 UTC
The branch main has been updated by garga:
URL: https://cgit.FreeBSD.org/ports/commit/?id=30dfe4eba542da9acfe9e6a6d738f1a24ec5a5b4
commit 30dfe4eba542da9acfe9e6a6d738f1a24ec5a5b4
Author: Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2022-04-20 14:54:12 +0000
Commit: Renato Botelho <garga@FreeBSD.org>
CommitDate: 2022-04-20 14:54:12 +0000
emulators/open-vm-tools: Fix build on current
Since 8b83d7e0ee544, -Wunused-but-set-variable became a fatal error on
CURRENT. Remove a couble of set-but-not-used variables and fix the
build
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
.../files/patch-modules_freebsd_vmblock_vfsops.c | 28 ++--------------------
1 file changed, 2 insertions(+), 26 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 64629219c5fa..ba54239caecd 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,18 +1,6 @@
---- modules/freebsd/vmblock/vfsops.c.orig 2021-09-24 04:19:18 UTC
+--- modules/freebsd/vmblock/vfsops.c.orig 2022-03-04 21:01:24 UTC
+++ modules/freebsd/vmblock/vfsops.c
-@@ -124,6 +124,11 @@ VMBlockVFSMount(struct mount *mp, // IN: mount(
- char *pathname;
- int len, error = 0;
-
-+#if __FreeBSD_version >= 800087
-+ struct thread *td;
-+ td = curthread;
-+#endif
-+
- VMBLOCKDEBUG("VMBlockVFSMount(mp = %p)\n", (void *)mp);
-
- /*
-@@ -171,14 +176,22 @@ VMBlockVFSMount(struct mount *mp, // IN: mount(
+@@ -171,14 +171,22 @@ VMBlockVFSMount(struct mount *mp, // IN: mount(
* Find lower node and lock if not already locked.
*/
@@ -35,15 +23,3 @@
/*
* Check multi VMBlock mount to avoid `lock against myself' panic.
-@@ -276,6 +289,11 @@ VMBlockVFSUnmount(struct mount *mp, // IN: filesyst
- void *mntdata;
- int error;
- int flags = 0, removed = 0;
-+
-+#if __FreeBSD_version >= 800087
-+ struct thread *td;
-+ td = curthread;
-+#endif
-
- VMBLOCKDEBUG("VMBlockVFSUnmount: mp = %p\n", (void *)mp);
-