From nobody Thu Dec 22 12:57:59 2022 X-Original-To: dev-commits-src-main@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 4Nd9Ms6H33z1HKyr; Thu, 22 Dec 2022 12:58:01 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nd9Ms1XfZz4YSb; Thu, 22 Dec 2022 12:58:01 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x230.google.com with SMTP id v70so1805131oie.3; Thu, 22 Dec 2022 04:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ivfLa6Gvvp6fZLu3IXIKobwPm9xGeR6fKwrBSvij4lc=; b=TUAlTW9iqyF3FonR/5iT6YKPSqHWvaiFUJu1Dgu5ZUSkckC1rwpadNeXzQ8koXKBIw Pv+GbJjG/QdPg8JKqel2RJnLTi0Y5NEc63qNLrVLwOkH3BziW8Patfm1jJZRpYJtb1fQ kEUt7r2/NUsUQoOtf5gA4wm37ZOcIlvwpeqiuIagFpoGOzPbP/vstGEcn9Ba+0Q9dV6Z UhKTTc0Ut5iueLU8PPSSQuKjvQzlPPo4yAbmetsxvfg5NvWsxA/4RfuZ2jmQQtgPon3O cVvIhe76eEejLa5oXuoUVLElFfspUu2MhLiu0LGQlNQlrhdSCSmZZIqkgCZo9/GMsWI0 ge/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ivfLa6Gvvp6fZLu3IXIKobwPm9xGeR6fKwrBSvij4lc=; b=UdAm/+s7TYdJl0a5lIMZW0Xg3Is7fAxDNLzhcOK+VOTI8Y4P5rRsAYd7I9CMw6rHzv OI6FwMDT134mn2VW8T518MiRA9rKPmcxFhJqNWtayR+VHBRzpbEgf913a6ugUE5sDiU6 3jncxTRRgslN7yCf10MB4NinzuF+ZjkK7dJmryUIIm4d/X7IQHFaxzwpD7/OWPzU7qaj UhxEtsBATyFj/81NAk7WcWuG/gYCVRhjQaA0/IgVWfsa3fXtMh1oEY7m2Jtyfa9Ola7X 5LHWs5h+CaYYV8NNCmAbU1PP4KyzcucAUFDNSItUUXbth9jy/nWPQ9jkBw4iit5ji4Zw /GgA== X-Gm-Message-State: AFqh2kpWGV0xSgEWoZ4Zc98uc5WJvFB5NOd1Up3SNwVdLbJS6GSsJ+87 04qdgvfx4wH70x1Ccz0O8QL4s4lthEty6CpcHf0C7wKL X-Google-Smtp-Source: AMrXdXvDL4SjnLjAXMeo7u2CHODKrDFdvPp6IA+wncuLK3+P5Z4YBjEQ6paWPAlHVGdTzxLBCfpjsKhZQ7u/BlFLKr8= X-Received: by 2002:a05:6808:aaf:b0:35e:4337:35a8 with SMTP id r15-20020a0568080aaf00b0035e433735a8mr202061oij.81.1671713880355; Thu, 22 Dec 2022 04:58:00 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:77d5:0:b0:491:8368:9bdd with HTTP; Thu, 22 Dec 2022 04:57:59 -0800 (PST) In-Reply-To: <15072738-61b4-f3cb-25b8-86c718559eab@FreeBSD.org> References: <202212190814.2BJ8EcoL052955@gitrepo.freebsd.org> <80ce4bdc-70b9-fb4e-a248-a9be0d453dd4@FreeBSD.org> <15072738-61b4-f3cb-25b8-86c718559eab@FreeBSD.org> From: Mateusz Guzik Date: Thu, 22 Dec 2022 13:57:59 +0100 Message-ID: Subject: Re: git: 269c564b90d3 - main - vfs: retire NDFREE To: Renato Botelho Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Nd9Ms1XfZz4YSb X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 12/22/22, Renato Botelho wrote: > 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 Well I did skimp on a version bump over there, but as this is *current*, people running the older version should just update and they will be fine. I think this will happen to work if you just check against 1400074 though, the necessary bits were already there for some time. -- Mateusz Guzik