Date: Thu, 22 Dec 2022 09:54:49 -0300 From: Renato Botelho <garga@FreeBSD.org> To: Mateusz Guzik <mjguzik@gmail.com> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 269c564b90d3 - main - vfs: retire NDFREE Message-ID: <15072738-61b4-f3cb-25b8-86c718559eab@FreeBSD.org> In-Reply-To: <CAGudoHF=2GvL5qapM9UrNK4brqa3Yn=XokarTVwe-p1EuY0Lgg@mail.gmail.com> References: <202212190814.2BJ8EcoL052955@gitrepo.freebsd.org> <80ce4bdc-70b9-fb4e-a248-a9be0d453dd4@FreeBSD.org> <CAGudoHF=2GvL5qapM9UrNK4brqa3Yn=XokarTVwe-p1EuY0Lgg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 22/12/22 09:29, Mateusz Guzik wrote:
> 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
This patch fails on OSVERSION 1400074 with the same error that happened
in the past when NDF_ONLY_PNBUF was retired
--- vfsops.o ---
vfsops.c:185:16: error: use of undeclared identifier 'NDF_ONLY_PNBUF'
NDFREE(ndp, NDF_ONLY_PNBUF);
I'll keep it checking if NDF_ONLY_PNBUF is defined to decide to call
NDFREE or NDFREE_PNBUF
--
Renato Botelho
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?15072738-61b4-f3cb-25b8-86c718559eab>