From nobody Mon Apr 04 17:58:09 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A522C1A8EF85; Mon, 4 Apr 2022 17:58:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KXJR53prNz3MZK; Mon, 4 Apr 2022 17:58:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649095089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZytB5GrF3rORu46wBFcfzJGkiVDv4Q2Z60KG5ZH7D8=; b=ybQSo7U+qMUiDZnDSi7n6t2u2yQJyJ4CcIvmyXibXfMoXjiVGj9kvKVoIhEBmqdrSspq0J M2und1H2ZLBfTx3dJnLLqqHYBIoovaP91xyFjuUWXK5iBMp09FM6k8cVp2bgHmAacTCD7/ 0iwKIUM6RrzFLEd+V9L6ps4ABp+oXMWj9DFCooTaYJlbDzzaqOQsEjJ9/hvedbF9MAFzHA jonX+veI7Cjz21T3yiTTqJN4o4j4UrRd9cvVVOM7pi3Buf+50GgQzN5IlDAIoktrSyXsEs BIAiI9PcoK+tyq7YwJAqpfZHVkswrIOlYKRTNfKVkZ7xPkAJODa44zBiaF47qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52DE216E82; Mon, 4 Apr 2022 17:58:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 234Hw9Uk043506; Mon, 4 Apr 2022 17:58:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234Hw9ZC043505; Mon, 4 Apr 2022 17:58:09 GMT (envelope-from git) Date: Mon, 4 Apr 2022 17:58:09 GMT Message-Id: <202204041758.234Hw9ZC043505@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: c55c6dd6767c - main - emulators/open-vm-tools: fix build after 2587b74c6187 removed NDF_ONLY_PNBUF List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c55c6dd6767ceaf37b3d69cff84d1b859e33d30e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649095089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZytB5GrF3rORu46wBFcfzJGkiVDv4Q2Z60KG5ZH7D8=; b=IDAbpMJ3Hzn/kZuag9hEUl/htisvKRGq7h9zf+8bgInQtU1c+ehgvR+Z3lvhLTKyo2h+at c8CQvrBSeOfzeHH4E3ZPINIDXta5PcvpUarS/NTpzqdpLni8Jzc1a/p+qpjtduHxI0LhWi DWVfBxtmFk6FQWdVJyUlFJDANtI+F6NhHY//vhHl0FslRMW6fJkMPNwknt0PkS6l1vawGl 1bBZD+iZGsOCwf7ND1gE9ofKg/R2j0IPHpB2d8a2wxuCqV0Fe69x2yMe3G9k4J51ty9YmW 5Eai/j5Kka/SXBpdh/n33swedy2jy7TBSrfm8O71TNoywUT/zUcmmp3UWVE/Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649095089; a=rsa-sha256; cv=none; b=pWQfGXea77TQV2XFhkK+5uBpLfz9Gw3Hd7dn6w12XL2e0p+LCm0qYF7qyaEVIbv0No7axg /gVVx1f+K+ZLJi4e1ZgyZuVO8onlqXl9XAWwVOsAocqrAFTd0kSxGvE03B7K5PH5Q8G0O6 VX/9jtlKDtt9r3pXQBAYTwYsTI1i1uzPb7JwxFIZi5giCKY22ZpKlUqitIbLI18l1qwmcr NQB67qDI/HL6mX1u2a7intGOKUCyz8ykOi/Hb4SmRokJ+KeC+vcjlddDSXHvlD/rYaxa1k SGDB+LcKQzKdSTu/SlbKuK/Q0JMIwgX7c9b2jhFY22gNDh+Y4ddOEkRd+Blpmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=c55c6dd6767ceaf37b3d69cff84d1b859e33d30e commit c55c6dd6767ceaf37b3d69cff84d1b859e33d30e Author: Dimitry Andric AuthorDate: 2022-04-04 15:21:54 +0000 Commit: Dimitry Andric CommitDate: 2022-04-04 17:54:55 +0000 emulators/open-vm-tools: fix build after 2587b74c6187 removed NDF_ONLY_PNBUF After base commit 2587b74c6187, which removed NDF_ONLY_PNBUF, emulators/open-vm-tools fails to build, with: --- vfsops.o --- vfsops.c:190:16: error: use of undeclared identifier 'NDF_ONLY_PNBUF'; did you mean 'NDFREE_PNBUF'? NDFREE(ndp, NDF_ONLY_PNBUF); ^~~~~~~~~~~~~~ NDFREE_PNBUF /usr/src/sys/sys/namei.h:291:6: note: 'NDFREE_PNBUF' declared here void NDFREE_PNBUF(struct nameidata *); ^ Indeed, NDFREE_PNBUF() should now be used. PR: 263041 Approved by: garga (maintainer) MFH: 2022Q2 --- .../files/patch-modules_freebsd_vmblock_vfsops.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 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;