dtrace: manual detypedeffing transforms

These are transformations Coccinelle cannot do, usually because it
cannot parse the constructs in question.

Signed-off-by: Nick Alcock <[email protected]>
Reviewed-by: David Mc Lean <[email protected]>

Author: nickalcock

dtrace/dtrace_dif.c

@@ -335,7 +335,7 @@ int dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate,
 			if (diftype != DIF_TYPE_CTF)
 				err += efunc(pc, "invalid val type %u\n",
 					     diftype);
-			if (er2 >= nregs)
+			if (r2 >= nregs)
 				err += efunc(pc, "invalid register %u\n", r2);
 			if (rs >= nregs)
 				err += efunc(pc, "invalid register %u\n", rs);

dtrace/dtrace_dof.c

@@ -886,7 +886,7 @@ int dtrace_dof_slurp(dof_hdr_t *dof, dtrace_vstate_t *vstate, const cred_t *cr,
 	uint_t			i;
 
 	ASSERT(MUTEX_HELD(&dtrace_lock));
-	ASSERT(dof->dofh_loadsz >= sizeof(dof_hdr_t));
+	ASSERT(dof->dofh_loadsz >= sizeof(struct dof_hdr));
 
 	dt_dbg_dof("  DOF 0x%p Slurping...\n", dof);
 

dtrace/dtrace_probe_ctx.c

@@ -592,7 +592,7 @@ void dtrace_aggregate(dtrace_aggregation_t *agg, dtrace_buffer_t *dbuf,
 		return;
 	}
 
-	ASSERT(!(sizeof(dtrace_aggkey_t) & (sizeof(uintptr_t) - 1)));
+	ASSERT(!(sizeof(struct dtrace_aggkey) & (sizeof(uintptr_t) - 1)));
 	key = (dtrace_aggkey_t *)(agb->dtagb_free - sizeof(dtrace_aggkey_t));
 	agb->dtagb_free -= sizeof(dtrace_aggkey_t);
 

include/dtrace/provider.h

@@ -822,7 +822,7 @@ extern void dtrace_probe(dtrace_id_t, uintptr_t, uintptr_t, uintptr_t,
   static int __init name##_init(void)					\
   {									\
 	int	ret = -ENOMEM;						\
-	dtrace_module_t *pdata = THIS_MODULE->pdata;			\
+	struct dtrace_module *pdata = THIS_MODULE->pdata;		\
 									\
 	if (pdata == NULL)						\
 		goto failed;						\
@@ -871,7 +871,7 @@ extern void dtrace_probe(dtrace_id_t, uintptr_t, uintptr_t, uintptr_t,
   static int __init name##_init(void)					\
   {									\
 	int	ret = -ENOMEM;						\
-	dtrace_module_t *pdata = THIS_MODULE->pdata;			\
+	struct dtrace_module *pdata = THIS_MODULE->pdata;		\
 									\
 	if (pdata == NULL)						\
 		goto failed;						\
@@ -905,7 +905,7 @@ extern void dtrace_probe(dtrace_id_t, uintptr_t, uintptr_t, uintptr_t,
   static int name##_prov_exit(void)					\
   {									\
 	int			ret = 0;				\
-	dtrace_mprovider_t	*prov;					\
+	struct dtrace_mprovider	*prov;					\
 									\
 	for (prov = plist; prov->dtmp_name != NULL; prov++) {		\
 		if (prov->dtmp_id != DTRACE_PROVNONE) {			\
@@ -927,8 +927,8 @@ extern void dtrace_probe(dtrace_id_t, uintptr_t, uintptr_t, uintptr_t,
   static int __init name##_init(void)					\
   {									\
 	int			ret = -ENOMEM;				\
-	dtrace_mprovider_t	*prov;					\
-	dtrace_module_t		*pdata = THIS_MODULE->pdata;		\
+	struct dtrace_mprovider	*prov;					\
+	struct dtrace_module	*pdata = THIS_MODULE->pdata;		\
 									\
 	if (pdata == NULL)						\
 		goto failed;						\

include/uapi/linux/dtrace/ioctl.h

@@ -3,7 +3,7 @@
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  *
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef _LINUX_DTRACE_IOCTL_H_
@@ -22,26 +22,26 @@
 #include <linux/dtrace/cpu_defines.h>
 
 #define DTRACEIOC		0xd4
-#define DTRACEIOC_PROVIDER	_IOR(DTRACEIOC, 1, dtrace_providerdesc_t)
-#define DTRACEIOC_PROBES	_IOR(DTRACEIOC, 2, dtrace_probedesc_t)
-#define DTRACEIOC_BUFSNAP	_IOR(DTRACEIOC, 4, dtrace_bufdesc_t)
-#define DTRACEIOC_PROBEMATCH	_IOR(DTRACEIOC, 5, dtrace_probedesc_t)
+#define DTRACEIOC_PROVIDER	_IOR(DTRACEIOC, 1, struct dtrace_providerdesc)
+#define DTRACEIOC_PROBES	_IOR(DTRACEIOC, 2, struct dtrace_probedesc)
+#define DTRACEIOC_BUFSNAP	_IOR(DTRACEIOC, 4, struct dtrace_bufdesc)
+#define DTRACEIOC_PROBEMATCH	_IOR(DTRACEIOC, 5, struct dtrace_probedesc)
 #define DTRACEIOC_ENABLE	_IOW(DTRACEIOC, 6, void *)
-#define DTRACEIOC_AGGSNAP	_IOR(DTRACEIOC, 7, dtrace_bufdesc_t)
-#define DTRACEIOC_EPROBE	_IOW(DTRACEIOC, 8, dtrace_eprobedesc_t)
-#define DTRACEIOC_PROBEARG	_IOR(DTRACEIOC, 9, dtrace_argdesc_t)
-#define DTRACEIOC_CONF		_IOR(DTRACEIOC, 10, dtrace_conf_t)
-#define DTRACEIOC_STATUS	_IOR(DTRACEIOC, 11, dtrace_status_t)
+#define DTRACEIOC_AGGSNAP	_IOR(DTRACEIOC, 7, struct dtrace_bufdesc)
+#define DTRACEIOC_EPROBE	_IOW(DTRACEIOC, 8, struct dtrace_eprobedesc)
+#define DTRACEIOC_PROBEARG	_IOR(DTRACEIOC, 9, struct dtrace_argdesc)
+#define DTRACEIOC_CONF		_IOR(DTRACEIOC, 10, struct dtrace_conf)
+#define DTRACEIOC_STATUS	_IOR(DTRACEIOC, 11, struct dtrace_status)
 #define DTRACEIOC_GO		_IOW(DTRACEIOC, 12, processorid_t)
 #define DTRACEIOC_STOP		_IOW(DTRACEIOC, 13, processorid_t)
-#define DTRACEIOC_AGGDESC	_IOR(DTRACEIOC, 15, dtrace_aggdesc_t)
-#define DTRACEIOC_FORMAT	_IOR(DTRACEIOC, 16, dtrace_fmtdesc_t)
-#define DTRACEIOC_DOFGET	_IOR(DTRACEIOC, 17, dof_hdr_t)
+#define DTRACEIOC_AGGDESC	_IOR(DTRACEIOC, 15, struct dtrace_aggdesc)
+#define DTRACEIOC_FORMAT	_IOR(DTRACEIOC, 16, struct dtrace_fmtdesc)
+#define DTRACEIOC_DOFGET	_IOR(DTRACEIOC, 17, struct dof_hdr)
 #define DTRACEIOC_REPLICATE	_IOR(DTRACEIOC, 18, void *)
 
 #define DTRACEHIOC		0xd8
-#define DTRACEHIOC_ADD		_IOW(DTRACEHIOC, 1, dof_hdr_t)
+#define DTRACEHIOC_ADD		_IOW(DTRACEHIOC, 1, struct dof_hdr)
 #define DTRACEHIOC_REMOVE	_IOW(DTRACEHIOC, 2, int)
-#define DTRACEHIOC_ADDDOF	_IOW(DTRACEHIOC, 3, dof_helper_t)
+#define DTRACEHIOC_ADDDOF	_IOW(DTRACEHIOC, 3, struct dof_helper)
 
 #endif /* _LINUX_DTRACE_IOCTL_H */