Clean up CSTYLEDs

69 CSTYLED BEGINs remain, appx. 30 of which can be removed if cstyle(1)
had a useful policy regarding
  CALL(ARG1,
  	ARG2,
  	ARG3);
above 2 lines. As it stands, it spits out *both*
  sysctl_os.c: 385: continuation line should be indented by 4 spaces
  sysctl_os.c: 385: indent by spaces instead of tabs
which is very cool

Another >10 could be fixed by removing "ulong" &al. handling.
I don't foresee anyone actually using it intentionally
(does it even exist in modern headers? why did it in the first place?).

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12993

include/os/linux/spl/sys/acl.h

@@ -102,13 +102,11 @@ typedef struct ace_object {
 
 #define	ACE_TYPE_FLAGS	(ACE_OWNER|ACE_GROUP|ACE_EVERYONE|ACE_IDENTIFIER_GROUP)
 
-/* BEGIN CSTYLED */
 #define	ACE_ALL_PERMS	(ACE_READ_DATA|ACE_LIST_DIRECTORY|ACE_WRITE_DATA| \
-     ACE_ADD_FILE|ACE_APPEND_DATA|ACE_ADD_SUBDIRECTORY|ACE_READ_NAMED_ATTRS| \
-     ACE_WRITE_NAMED_ATTRS|ACE_EXECUTE|ACE_DELETE_CHILD|ACE_READ_ATTRIBUTES| \
-     ACE_WRITE_ATTRIBUTES|ACE_DELETE|ACE_READ_ACL|ACE_WRITE_ACL| \
-     ACE_WRITE_OWNER|ACE_SYNCHRONIZE)
-/* END CSTYLED */
+	ACE_ADD_FILE|ACE_APPEND_DATA|ACE_ADD_SUBDIRECTORY|ACE_READ_NAMED_ATTRS|\
+	ACE_WRITE_NAMED_ATTRS|ACE_EXECUTE|ACE_DELETE_CHILD|ACE_READ_ATTRIBUTES|\
+	ACE_WRITE_ATTRIBUTES|ACE_DELETE|ACE_READ_ACL|ACE_WRITE_ACL| \
+	ACE_WRITE_OWNER|ACE_SYNCHRONIZE)
 
 #define	VSA_ACE						0x0010
 #define	VSA_ACECNT					0x0020

include/os/linux/spl/sys/debug.h

@@ -58,74 +58,73 @@ int spl_panic(const char *file, const char *func, int line,
     const char *fmt, ...);
 void spl_dumpstack(void);
 
-/* BEGIN CSTYLED */
 #define	PANIC(fmt, a...)						\
 	spl_panic(__FILE__, __FUNCTION__, __LINE__, fmt, ## a)
 
-#define	VERIFY(cond)										\
-	(void) (unlikely(!(cond)) &&							\
+#define	VERIFY(cond)							\
+	(void) (unlikely(!(cond)) &&					\
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__,			\
 	    "%s", "VERIFY(" #cond ") failed\n"))
 
-#define	VERIFY3B(LEFT, OP, RIGHT)	do {					\
+#define	VERIFY3B(LEFT, OP, RIGHT)	do {				\
 		const boolean_t _verify3_left = (boolean_t)(LEFT);	\
-		const boolean_t _verify3_right = (boolean_t)(RIGHT);\
+		const boolean_t _verify3_right = (boolean_t)(RIGHT);	\
 		if (unlikely(!(_verify3_left OP _verify3_right)))	\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%d " #OP " %d)\n",						\
-		    (boolean_t) (_verify3_left),					\
-		    (boolean_t) (_verify3_right));					\
+		    "failed (%d " #OP " %d)\n",				\
+		    (boolean_t)(_verify3_left),				\
+		    (boolean_t)(_verify3_right));			\
 	} while (0)
 
-#define	VERIFY3S(LEFT, OP, RIGHT)	do {					\
+#define	VERIFY3S(LEFT, OP, RIGHT)	do {				\
 		const int64_t _verify3_left = (int64_t)(LEFT);		\
 		const int64_t _verify3_right = (int64_t)(RIGHT);	\
 		if (unlikely(!(_verify3_left OP _verify3_right)))	\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%lld " #OP " %lld)\n",					\
-		    (long long) (_verify3_left),					\
-		    (long long) (_verify3_right));					\
+		    "failed (%lld " #OP " %lld)\n",			\
+		    (long long)(_verify3_left),				\
+		    (long long)(_verify3_right));			\
 	} while (0)
 
-#define	VERIFY3U(LEFT, OP, RIGHT)	do {					\
+#define	VERIFY3U(LEFT, OP, RIGHT)	do {				\
 		const uint64_t _verify3_left = (uint64_t)(LEFT);	\
 		const uint64_t _verify3_right = (uint64_t)(RIGHT);	\
 		if (unlikely(!(_verify3_left OP _verify3_right)))	\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%llu " #OP " %llu)\n",					\
-		    (unsigned long long) (_verify3_left),			\
-		    (unsigned long long) (_verify3_right));			\
+		    "failed (%llu " #OP " %llu)\n",			\
+		    (unsigned long long)(_verify3_left),		\
+		    (unsigned long long)(_verify3_right));		\
 	} while (0)
 
-#define	VERIFY3P(LEFT, OP, RIGHT)	do {					\
+#define	VERIFY3P(LEFT, OP, RIGHT)	do {				\
 		const uintptr_t _verify3_left = (uintptr_t)(LEFT);	\
-		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);\
+		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);	\
 		if (unlikely(!(_verify3_left OP _verify3_right)))	\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 		    "VERIFY3(" #LEFT " "  #OP " "  #RIGHT ") "		\
-		    "failed (%px " #OP " %px)\n",					\
-		    (void *) (_verify3_left),						\
-		    (void *) (_verify3_right));						\
+		    "failed (%px " #OP " %px)\n",			\
+		    (void *) (_verify3_left),				\
+		    (void *) (_verify3_right));				\
 	} while (0)
 
-#define	VERIFY0(RIGHT)	do {								\
-		const int64_t _verify3_left = (int64_t)(0);			\
+#define	VERIFY0(RIGHT)	do {						\
+		const int64_t _verify3_left = (int64_t)(0);		\
 		const int64_t _verify3_right = (int64_t)(RIGHT);	\
 		if (unlikely(!(_verify3_left == _verify3_right)))	\
 		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
-		    "VERIFY3(0 == " #RIGHT ") "						\
-		    "failed (0 == %lld)\n",							\
-		    (long long) (_verify3_right));					\
+		    "VERIFY3(0 == " #RIGHT ") "				\
+		    "failed (0 == %lld)\n",				\
+		    (long long) (_verify3_right));			\
 	} while (0)
 
 #define	CTASSERT_GLOBAL(x)		_CTASSERT(x, __LINE__)
 #define	CTASSERT(x)			{ _CTASSERT(x, __LINE__); }
 #define	_CTASSERT(x, y)			__CTASSERT(x, y)
 #define	__CTASSERT(x, y)						\
-	typedef char __attribute__ ((unused))				\
+	typedef char __attribute__((unused))				\
 	__compile_time_assertion__ ## y[(x) ? 1 : -1]
 
 /*
@@ -167,7 +166,6 @@ void spl_dumpstack(void);
 	((void)(likely(!!(A) == !!(B)) || \
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__, \
 	    "(" #A ") is equivalent to (" #B ")")))
-/* END CSTYLED */
 
 #endif /* NDEBUG */
 

include/os/linux/spl/sys/mutex.h

@@ -113,8 +113,8 @@ spl_mutex_lockdep_on_maybe(kmutex_t *mp)			\
 	VERIFY3P(mutex_owner(mp), ==, NULL);			\
 }
 
-/* BEGIN CSTYLED */
 #define	mutex_tryenter(mp)					\
+/* CSTYLED */								\
 ({								\
 	int _rc_;						\
 								\
@@ -125,7 +125,6 @@ spl_mutex_lockdep_on_maybe(kmutex_t *mp)			\
 								\
 	_rc_;							\
 })
-/* END CSTYLED */
 
 #define	NESTED_SINGLE 1
 

include/os/linux/spl/sys/rwlock.h

@@ -116,8 +116,7 @@ RW_READ_HELD(krwlock_t *rwp)
  * will be correctly located in the users code which is important
  * for the built in kernel lock analysis tools
  */
-/* BEGIN CSTYLED */
-#define	rw_init(rwp, name, type, arg)					\
+#define	rw_init(rwp, name, type, arg) /* CSTYLED */			\
 ({									\
 	static struct lock_class_key __key;				\
 	ASSERT(type == RW_DEFAULT || type == RW_NOLOCKDEP);		\
@@ -138,7 +137,7 @@ RW_READ_HELD(krwlock_t *rwp)
  */
 #define	rw_tryupgrade(rwp)	RW_WRITE_HELD(rwp)
 
-#define	rw_tryenter(rwp, rw)						\
+#define	rw_tryenter(rwp, rw) /* CSTYLED */				\
 ({									\
 	int _rc_ = 0;							\
 									\
@@ -158,7 +157,7 @@ RW_READ_HELD(krwlock_t *rwp)
 	_rc_;								\
 })
 
-#define	rw_enter(rwp, rw)						\
+#define	rw_enter(rwp, rw) /* CSTYLED */					\
 ({									\
 	spl_rw_lockdep_off_maybe(rwp);					\
 	switch (rw) {							\
@@ -175,7 +174,7 @@ RW_READ_HELD(krwlock_t *rwp)
 	spl_rw_lockdep_on_maybe(rwp);					\
 })
 
-#define	rw_exit(rwp)							\
+#define	rw_exit(rwp) /* CSTYLED */					\
 ({									\
 	spl_rw_lockdep_off_maybe(rwp);					\
 	if (RW_WRITE_HELD(rwp)) {					\
@@ -188,13 +187,12 @@ RW_READ_HELD(krwlock_t *rwp)
 	spl_rw_lockdep_on_maybe(rwp);					\
 })
 
-#define	rw_downgrade(rwp)						\
+#define	rw_downgrade(rwp) /* CSTYLED */					\
 ({									\
 	spl_rw_lockdep_off_maybe(rwp);					\
 	spl_rw_clear_owner(rwp);					\
 	downgrade_write(SEM(rwp));					\
 	spl_rw_lockdep_on_maybe(rwp);					\
 })
-/* END CSTYLED */
 
 #endif /* _SPL_RWLOCK_H */

include/os/linux/spl/sys/thread.h

@@ -49,11 +49,9 @@ typedef void (*thread_func_t)(void *);
 	__thread_create(stk, stksize, (thread_func_t)func,		\
 	name, arg, len, pp, state, pri)
 
-/* BEGIN CSTYLED */
 #define	thread_create(stk, stksize, func, arg, len, pp, state, pri)	\
-	__thread_create(stk, stksize, (thread_func_t)func,		\
-	#func, arg, len, pp, state, pri)
-/* END CSTYLED */
+	__thread_create(stk, stksize, (thread_func_t)func, #func,	\
+	arg, len, pp, state, pri)
 
 #define	thread_exit()			__thread_exit()
 #define	thread_join(t)			VERIFY(0)

include/os/linux/spl/sys/trace_taskq.h

@@ -40,26 +40,20 @@
  * DTRACE_PROBE1(...,
  *     taskq_ent_t *, ...);
  */
-/* BEGIN CSTYLED */
 DECLARE_EVENT_CLASS(zfs_taskq_ent_class,
-	TP_PROTO(taskq_ent_t *taskq_ent),
-	TP_ARGS(taskq_ent),
-	TP_STRUCT__entry(
-	    __field(taskq_ent_t *,	taskq_ent)
-	),
-	TP_fast_assign(
-	    __entry->taskq_ent	= taskq_ent;
-	),
-	TP_printk("taskq_ent %p", __entry->taskq_ent)
+    TP_PROTO(taskq_ent_t *taskq_ent),
+    TP_ARGS(taskq_ent),
+    TP_STRUCT__entry(__field(taskq_ent_t *, taskq_ent)),
+    TP_fast_assign(
+	__entry->taskq_ent = taskq_ent;
+),
+    TP_printk("taskq_ent %p", __entry->taskq_ent)
 );
-/* END CSTYLED */
 
-/* BEGIN CSTYLED */
-#define DEFINE_TASKQ_EVENT(name) \
+#define	DEFINE_TASKQ_EVENT(name) \
 DEFINE_EVENT(zfs_taskq_ent_class, name, \
-	TP_PROTO(taskq_ent_t *taskq_ent), \
-	TP_ARGS(taskq_ent))
-/* END CSTYLED */
+    TP_PROTO(taskq_ent_t *taskq_ent), \
+    TP_ARGS(taskq_ent))
 DEFINE_TASKQ_EVENT(zfs_taskq_ent__birth);
 DEFINE_TASKQ_EVENT(zfs_taskq_ent__start);
 DEFINE_TASKQ_EVENT(zfs_taskq_ent__finish);