Attachment 232936 Details for Bug 263041 – fix build after 2587b74c6187 removed NDF_ONLY_PNBUF

[patch] fix build after 2587b74c6187 removed NDF_ONLY_PNBUF

emulators__open-vm-tools-fix-NDF_ONLY_PNBUF-1.diff (text/plain), 1.40 KB, created by Dimitry Andric on 2022-04-04 15:25:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2022-04-04 15:25:52 UTC

Size: 1.40 KB

patch

obsolete

>commit 81a385ea01d1abef65cbdabd3c03318ec48d8655
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Mon Apr 4 17:21:54 2022 +0200
>
>    emulators/open-vm-tools: fix build after 2587b74c6187 removed NDF_ONLY_PNBUF
>
>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 1b05ca6c1e9c..64629219c5fa 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
>@@ -12,7 +12,7 @@
>     VMBLOCKDEBUG("VMBlockVFSMount(mp = %p)\n", (void *)mp);
>  
>     /*
>-@@ -171,7 +176,11 @@ VMBlockVFSMount(struct mount *mp,        // IN: mount(
>+@@ -171,14 +176,22 @@ VMBlockVFSMount(struct mount *mp,        // IN: mount(
>      * Find lower node and lock if not already locked.
>      */
>  
>@@ -24,7 +24,18 @@
>     error = namei(ndp);
>     if (error) {
>        NDFREE(ndp, 0);
>-@@ -276,6 +285,11 @@ VMBlockVFSUnmount(struct mount *mp,    // IN: filesyst
>+       uma_zfree(VMBlockPathnameZone, pathname);
>+       return error;
>+    }
>++#ifdef NDF_ONLY_PNBUF
>+    NDFREE(ndp, NDF_ONLY_PNBUF);
>++#else
>++   NDFREE_PNBUF(ndp);
>++#endif
>+ 
>+    /*
>+     * 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;

Actions: View | Diff

Attachments on bug 263041: 232936