[DTrace-devel] [PATCH 2/6] translators: procfs.d: rename projid_t

Nick Alcock nick.alcock at oracle.com
Wed Mar 2 13:44:32 UTC 2022


The Linux kernel already has a type named projid_t, with a definition
that conflicts with that in use (for an unused field) by this
translator.  libctf correctly diagnoses this as a conflict (where
libdtrace-ctf didn't): rename the type in the translator.

Signed-off-by: Nick Alcock <nick.alcock at oracle.com>
---
 libdtrace/procfs.d.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libdtrace/procfs.d.in b/libdtrace/procfs.d.in
index b63ce2147b45..038cf69b593c 100644
--- a/libdtrace/procfs.d.in
+++ b/libdtrace/procfs.d.in
@@ -50,7 +50,7 @@ typedef struct lwpsinfo {
 } lwpsinfo_t;
 
 typedef id_t taskid_t;
-typedef id_t projid_t;
+typedef id_t dprojid_t;
 typedef id_t poolid_t;
 typedef id_t zoneid_t;
 
@@ -95,7 +95,7 @@ typedef struct psinfo {
 	char pr_dmodel;			/* data model */
 	char pr_pad2[3];
 	taskid_t pr_taskid;		/* task id */
-	projid_t pr_projid;		/* project id */
+	dprojid_t pr_projid;		/* project id */
 	int pr_nzomb;			/* number of zombie lwps (Linux: 0) */
 	poolid_t pr_poolid;		/* pool id */
 	zoneid_t pr_zoneid;		/* zone id */
-- 
2.35.0.260.gb82b153193.dirty




More information about the DTrace-devel mailing list