From nobody Mon Jun 16 21:37:26 2025 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 4bLjyb0ndWz5yRtG; Mon, 16 Jun 2025 21:37:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLjyZ2sghz3Jmm; Mon, 16 Jun 2025 21:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109846; 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=1rBst8MKT5+SBWEyzqcGpJagOsN6l5m/Wymk6E3z6SA=; b=Tm4PUbv0hcwr7UtlPXiavJChjRogSIsOppxO8f9WZCp8QEWo/8naQB1vMVY5wuqAIoe6UR GX8l41Pzqatd4EjVAna4mc6HHIxfplMA0+Ad89OJQ93VdiF9+DNJfgF7tzxeyz5XBhrVhT eBFBiAKVK/lBd0WkgOYPx6W5uQJIfYQB1BQfBG1FeYGT6VSNetbIbQzGe2r8bXKMMUygrm c9+bVCk1BpnlJC90iXESgZ1+giAsG3iu2fsOoj0h1poZz11w7Z2C5lbdTIXBV5ieC6jxWg UwsmosOns5kCVtP8Ub6UVdN1o202OV1or5BDY1k2U7uLESqPXb3fTvMBS78ySg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109846; 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=1rBst8MKT5+SBWEyzqcGpJagOsN6l5m/Wymk6E3z6SA=; b=uFhMhWqgI7WQzgePQzHg5SmTXn/LrZP9IhWhR/q81gXnrb9CIuun1tTltSuADgl0iIY+4S F1pUvoSwldO4jIbskPdu2oYB+N/rBn8PPfjRo7icrnOl3XwfYtmWvkyVZJZsT4PVawRMZx rbhv0jnGyJ+k4NsSbLd7U1kvSSfku+iVfuDDgxqnOTIudmeCbqi8OsWJg0j1Tr5DZVactm 06SjcVPJ6Ts43qA4C5bbvvyNE/plAzG4V9PmKhHGakbTGnRNLPTB114tUDXKsS0PwyF6cV HMz1GKEUIc/DJUCrTDcnTRdNmGOE0lLznEe9AgXmjuOpcV8NFMua90Ot85O16g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109846; a=rsa-sha256; cv=none; b=QvR28FS6AT8Ew/YflDgfpOMsNSeikHpBIlDSgrg4V2B8pjQBNG+gMPJO23LrXrEF+GnOMF nwzJKXh6d1aBskoLUI8mU6M9oFPpBMXPIsfQEW/H3BHq/uH0NgyoYkTx7Qqm46pAqSNwEZ DjhzNP5YMQO3qlkw+dJqtYGiFDBB3oUv7HADHcxMbpOmrQCwQJUHrAAE5ZpVxNcpIE2h5Q ivC4rZeFY6yjn8geQ2VweJFTLZwHUrCpttDNQSYtKvMCiXt1ogSjByIbAJqHzglrIMx3W2 o63RItZynZaWf90zBqgEecvH1RVB1ncF4LdbCTcg5d1PEhsJjAI23P7576Gmzw== 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 4bLjyZ2DDKz14b; Mon, 16 Jun 2025 21:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55GLbQNA073097; Mon, 16 Jun 2025 21:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbQsu073094; Mon, 16 Jun 2025 21:37:26 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:26 GMT Message-Id: <202506162137.55GLbQsu073094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 20aaf0f6578c - main - libprocstat: Drop all _KERNEL defines outside of zfs_defs.c 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20aaf0f6578cfb273383332fb9188548b53d2ca7 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=20aaf0f6578cfb273383332fb9188548b53d2ca7 commit 20aaf0f6578cfb273383332fb9188548b53d2ca7 Author: Jessica Clarke AuthorDate: 2025-06-16 21:33:54 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:33:54 +0000 libprocstat: Drop all _KERNEL defines outside of zfs_defs.c Defining _KERNEL is a historical hack that can often break due to the environment not actually being that of a kernel build. Now that we have other targeted macros we can define instead that don't have far-reaching implications like _KERNEL we can drop this. Reviewed by: imp, kib, markj Differential Revision: https://reviews.freebsd.org/D50719 --- lib/libprocstat/cd9660.c | 3 +-- lib/libprocstat/msdosfs.c | 15 +++------------ lib/libprocstat/smbfs.c | 3 +-- lib/libprocstat/udf.c | 2 -- lib/libprocstat/zfs.c | 3 +-- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/libprocstat/cd9660.c b/lib/libprocstat/cd9660.c index de1140145527..ec37f49df0f6 100644 --- a/lib/libprocstat/cd9660.c +++ b/lib/libprocstat/cd9660.c @@ -52,9 +52,8 @@ #include -#define _KERNEL +#define _WANT_ISO_MNT #include -#undef _KERNEL #include #include diff --git a/lib/libprocstat/msdosfs.c b/lib/libprocstat/msdosfs.c index bb1ad65e6b1a..01345bb8d334 100644 --- a/lib/libprocstat/msdosfs.c +++ b/lib/libprocstat/msdosfs.c @@ -44,17 +44,15 @@ #include #include #include +#include #include -#define _KERNEL -#include +#define _WANT_MSDOSFS_INTERNALS #include #include -#undef _KERNEL - -#include #include +#include #include #include @@ -62,13 +60,6 @@ #include #include -/* - * XXX - - * VTODE is defined in denode.h only if _KERNEL is defined, but that leads to - * header explosion - */ -#define VTODE(vp) ((struct denode *)getvnodedata(vp)) - #include "libprocstat.h" #include "common_kvm.h" diff --git a/lib/libprocstat/smbfs.c b/lib/libprocstat/smbfs.c index 136cceacb471..cbd32cf8f597 100644 --- a/lib/libprocstat/smbfs.c +++ b/lib/libprocstat/smbfs.c @@ -32,9 +32,8 @@ #include #include #include -#define _KERNEL +#define _WANT_MOUNT #include -#undef _KERNEL #include diff --git a/lib/libprocstat/udf.c b/lib/libprocstat/udf.c index 9a110950f8b0..3298af6dec5f 100644 --- a/lib/libprocstat/udf.c +++ b/lib/libprocstat/udf.c @@ -32,9 +32,7 @@ #include #include #include -#define _KERNEL #include -#undef _KERNEL #include diff --git a/lib/libprocstat/zfs.c b/lib/libprocstat/zfs.c index 665b1e5abe24..010337c1919a 100644 --- a/lib/libprocstat/zfs.c +++ b/lib/libprocstat/zfs.c @@ -31,9 +31,8 @@ #include #include -#define _KERNEL +#define _WANT_MOUNT #include -#undef _KERNEL #include #include #include