Re: git: 269c564b90d3 - main - vfs: retire NDFREE
Date: Thu, 22 Dec 2022 12:29:35 UTC
diff -ru open-vm-tools-stable-12.0.0/open-vm-tools/modules/freebsd/vmblock/vfsops.c open-vm-tools-stable-12.0.0.patched/open-vm-tools/modules/freebsd/vmblock/vfsops.c --- open-vm-tools-stable-12.0.0/open-vm-tools/modules/freebsd/vmblock/vfsops.c 2022-03-04 21:01:24.000000000 +0000 +++ open-vm-tools-stable-12.0.0.patched/open-vm-tools/modules/freebsd/vmblock/vfsops.c 2022-12-22 12:27:51.897759000 +0000 @@ -174,11 +174,14 @@ NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target, compat_td); error = namei(ndp); if (error) { - NDFREE(ndp, 0); uma_zfree(VMBlockPathnameZone, pathname); return error; } +#if __FreeBSD_version < 1400075 NDFREE(ndp, NDF_ONLY_PNBUF); +#else + NDFREE_PNBUF(ndp); +#endif /* * Check multi VMBlock mount to avoid `lock against myself' panic. On 12/22/22, Renato Botelho <garga@freebsd.org> wrote: > On 19/12/22 05:14, Mateusz Guzik wrote: >> The branch main has been updated by mjg: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=269c564b90d3f95ac3afbd4bd1adad36681f2b93 >> >> commit 269c564b90d3f95ac3afbd4bd1adad36681f2b93 >> Author: Mateusz Guzik <mjg@FreeBSD.org> >> AuthorDate: 2022-11-17 16:59:20 +0000 >> Commit: Mateusz Guzik <mjg@FreeBSD.org> >> CommitDate: 2022-12-19 08:07:54 +0000 >> >> vfs: retire NDFREE >> >> There are no consumers anymore. Interested parties can NDFREE_PNBUF >> and vput or vrele relevant vnodes. >> >> Tested by: pho > > Hello Mateusz! > > This change broke open-vm-tools. If you have any advice about a proper > fix please let me know, otherwise I'm going to take a look at it when I > have some spare time. > > https://pkg-status.freebsd.org/beefy17/data/main-i386-default/p3a8cf525382f_s54b96380f5/logs/open-vm-tools-nox11-12.1.5,2.log > > -- > Renato Botelho > > -- Mateusz Guzik <mjguzik gmail.com>