clang-format: do automatic comment fixups

Result of `make indent` after enabling AlignTrailingComments.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>

9 files changed, 110 insertions, 110 deletions

diff --git a/test/zdtm/static/aio01.c b/test/zdtm/static/aio01.c
index ed45192b9..100069b03 100644
--- a/test/zdtm/static/aio01.c
+++ b/test/zdtm/static/aio01.c
@@ -14,8 +14,8 @@ const char *test_doc = "Check head and tail restore correct";
 const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 struct aio_ring {
-	unsigned id; /* kernel internal index number */
-	unsigned nr; /* number of io_events */
+	unsigned id;   /* kernel internal index number */
+	unsigned nr;   /* number of io_events */
 	unsigned head; /* Written to by userland or under ring_lock
 				 * mutex by aio_read_events_ring(). */
 	unsigned tail;
diff --git a/test/zdtm/static/auto_dev-ioctl.h b/test/zdtm/static/auto_dev-ioctl.h
index e65259b30..1b35fe2f7 100644
--- a/test/zdtm/static/auto_dev-ioctl.h
+++ b/test/zdtm/static/auto_dev-ioctl.h
@@ -95,7 +95,7 @@ struct args_ismountpoint {
 struct autofs_dev_ioctl {
 	__u32 ver_major;
 	__u32 ver_minor;
-	__u32 size; /* total size of data passed in
+	__u32 size;    /* total size of data passed in
 				 * including this struct */
 	__s32 ioctlfd; /* automount command fd */
 
diff --git a/test/zdtm/static/file_locks00.c b/test/zdtm/static/file_locks00.c
index 0b5d1313b..01782fa7a 100644
--- a/test/zdtm/static/file_locks00.c
+++ b/test/zdtm/static/file_locks00.c
@@ -23,10 +23,10 @@ static int lock_reg(int fd, int cmd, int type, int whence, off_t offset, off_t l
 {
 	struct flock lock;
 
-	lock.l_type = type; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_type = type;	/* F_RDLCK, F_WRLCK, F_UNLCK */
 	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start = offset; /* byte offset, relative to l_whence */
-	lock.l_len = len; /* #bytes (0 means to EOF) */
+	lock.l_start = offset;	/* byte offset, relative to l_whence */
+	lock.l_len = len;	/* #bytes (0 means to EOF) */
 
 	errno = 0;
 	return fcntl(fd, cmd, &lock);
@@ -40,10 +40,10 @@ static int check_read_lock(int fd, int whence, off_t offset, off_t len)
 	struct flock lock;
 	int ret;
 
-	lock.l_type = F_RDLCK; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_type = F_RDLCK;	/* F_RDLCK, F_WRLCK, F_UNLCK */
 	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start = offset; /* byte offset, relative to l_whence */
-	lock.l_len = len; /* #bytes (0 means to EOF) */
+	lock.l_start = offset;	/* byte offset, relative to l_whence */
+	lock.l_len = len;	/* #bytes (0 means to EOF) */
 	lock.l_pid = -1;
 
 	errno = 0;
@@ -69,10 +69,10 @@ static int check_write_lock(int fd, int whence, off_t offset, off_t len)
 	int ret;
 	pid_t ppid = getppid();
 
-	lock.l_type = F_WRLCK; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_type = F_WRLCK;	/* F_RDLCK, F_WRLCK, F_UNLCK */
 	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start = offset; /* byte offset, relative to l_whence */
-	lock.l_len = len; /* #bytes (0 means to EOF) */
+	lock.l_start = offset;	/* byte offset, relative to l_whence */
+	lock.l_len = len;	/* #bytes (0 means to EOF) */
 	lock.l_pid = -1;
 
 	errno = 0;
diff --git a/test/zdtm/static/ipc_namespace.c b/test/zdtm/static/ipc_namespace.c
index 4273951ae..b13b357ba 100644
--- a/test/zdtm/static/ipc_namespace.c
+++ b/test/zdtm/static/ipc_namespace.c
@@ -52,10 +52,10 @@ struct ipc_ns {
 
 	//	unsigned int    mq_queues_count;
 
-	unsigned int mq_queues_max; /* initialized to DFLT_QUEUESMAX */
-	unsigned int mq_msg_max; /* initialized to DFLT_MSGMAX */
-	unsigned int mq_msgsize_max; /* initialized to DFLT_MSGSIZEMAX */
-	unsigned int mq_msg_default; /* initialized to DFLT_MSG */
+	unsigned int mq_queues_max;	 /* initialized to DFLT_QUEUESMAX */
+	unsigned int mq_msg_max;	 /* initialized to DFLT_MSGMAX */
+	unsigned int mq_msgsize_max;	 /* initialized to DFLT_MSGSIZEMAX */
+	unsigned int mq_msg_default;	 /* initialized to DFLT_MSG */
 	unsigned int mq_msgsize_default; /* initialized to DFLT_MSGSIZE */
 
 	struct user_ns *user_ns;
diff --git a/test/zdtm/static/netns-dev.c b/test/zdtm/static/netns-dev.c
index e220daa7f..1e6ee1dea 100644
--- a/test/zdtm/static/netns-dev.c
+++ b/test/zdtm/static/netns-dev.c
@@ -55,36 +55,36 @@ struct range {
 };
 
 struct range rand_range4[] = {
-	{ 0, 1 }, /* accept_local */
-	{ -1, 0 }, /* accept_source_route */
-	{ 0, 1 }, /* arp_accept */
-	{ 0, 2 }, /* arp_announce */
-	{ 0, 1 }, /* arp_filter */
-	{ 0, 8 }, /* arp_ignore */
-	{ 0, 1 }, /* arp_notify */
-	{ 0, 1 }, /* bootp_relay */
-	{ 0, 1 }, /* disable_policy */
-	{ 0, 1 }, /* disable_xfrm */
-	{ 0, 1 }, /* drop_gratuitous_arp */
-	{ 0, 1 }, /* drop_unicast_in_l2_multicast */
-	{ 0, INT_MAX }, /* force_igmp_version */
-	{ 0, 1 }, /* forwarding */
-	{ 0, 1 }, /* accept_redirects */
-	{ 0, INT_MAX }, /* igmpv2_unsolicited_report_interval */
-	{ 0, INT_MAX }, /* igmpv3_unsolicited_report_interval */
-	{ 0, 1 }, /* ignore_routes_with_linkdown */
-	{ 0, 1 }, /* log_martians */
-	{ 0, 1 }, /* mc_forwarding */
-	{ -1, INT_MAX }, /* medium_id */
-	{ 0, 1 }, /* promote_secondaries */
-	{ 0, 1 }, /* proxy_arp */
-	{ 0, 1 }, /* proxy_arp_pvlan */
-	{ 0, 1 }, /* route_localnet */
-	{ 0, 2 }, /* rp_filter */
-	{ 0, 1 }, /* secure_redirects */
-	{ 0, 1 }, /* send_redirects */
-	{ 0, 1 }, /* shared_media */
-	{ 0, 1 }, /* src_valid_mark */
+	{ 0, 1 },	      /* accept_local */
+	{ -1, 0 },	      /* accept_source_route */
+	{ 0, 1 },	      /* arp_accept */
+	{ 0, 2 },	      /* arp_announce */
+	{ 0, 1 },	      /* arp_filter */
+	{ 0, 8 },	      /* arp_ignore */
+	{ 0, 1 },	      /* arp_notify */
+	{ 0, 1 },	      /* bootp_relay */
+	{ 0, 1 },	      /* disable_policy */
+	{ 0, 1 },	      /* disable_xfrm */
+	{ 0, 1 },	      /* drop_gratuitous_arp */
+	{ 0, 1 },	      /* drop_unicast_in_l2_multicast */
+	{ 0, INT_MAX },	      /* force_igmp_version */
+	{ 0, 1 },	      /* forwarding */
+	{ 0, 1 },	      /* accept_redirects */
+	{ 0, INT_MAX },	      /* igmpv2_unsolicited_report_interval */
+	{ 0, INT_MAX },	      /* igmpv3_unsolicited_report_interval */
+	{ 0, 1 },	      /* ignore_routes_with_linkdown */
+	{ 0, 1 },	      /* log_martians */
+	{ 0, 1 },	      /* mc_forwarding */
+	{ -1, INT_MAX },      /* medium_id */
+	{ 0, 1 },	      /* promote_secondaries */
+	{ 0, 1 },	      /* proxy_arp */
+	{ 0, 1 },	      /* proxy_arp_pvlan */
+	{ 0, 1 },	      /* route_localnet */
+	{ 0, 2 },	      /* rp_filter */
+	{ 0, 1 },	      /* secure_redirects */
+	{ 0, 1 },	      /* send_redirects */
+	{ 0, 1 },	      /* shared_media */
+	{ 0, 1 },	      /* src_valid_mark */
 	{ INT_MIN, INT_MAX }, /* tag */
 };
 
@@ -139,47 +139,47 @@ char *devconfs6[] = {
 #define MAX_ADDRESSES 128
 
 struct range rand_range6[] = {
-	{ 0, 2 }, /* accept_dad */
-	{ 0, 2 }, /* accept_ra */
-	{ 0, 1 }, /* accept_ra_defrtr */
-	{ 0, 1 }, /* accept_ra_from_local */
-	{ 0, INT_MAX }, /* accept_ra_min_hop_limit */
-	{ 0, 1 }, /* accept_ra_mtu */
-	{ 0, 1 }, /* accept_ra_pinfo */
-	{ 0, INT_MAX }, /* accept_ra_rt_info_max_plen */
-	{ 0, 1 }, /* accept_ra_rtr_pref */
-	{ -1, 0 }, /* accept_source_route */
-	{ 0, 1 }, /* autoconf */
-	{ 0, INT_MAX }, /* dad_transmits */
-	{ 0, 1 }, /* disable_ipv6 */
-	{ 0, 1 }, /* drop_unicast_in_l2_multicast */
-	{ 0, 1 }, /* drop_unsolicited_na */
-	{ 0, 2 }, /* force_mld_version */
-	{ 0, 1 }, /* force_tllao */
-	{ 0, 1 }, /* forwarding */
-	{ 0, 1 }, /* accept_redirects */
-	{ 1, 255 }, /* hop_limit */
-	{ 0, 1 }, /* ignore_routes_with_linkdown */
-	{ -1, 1 }, /* keep_addr_on_down */
-	{ 0, MAX_ADDRESSES }, /* max_addresses */
-	{ 0, INT_MAX }, /* max_desync_factor */
-	{ 0, INT_MAX }, /* mldv1_unsolicited_report_interval */
-	{ 0, INT_MAX }, /* mldv2_unsolicited_report_interval */
+	{ 0, 2 },			/* accept_dad */
+	{ 0, 2 },			/* accept_ra */
+	{ 0, 1 },			/* accept_ra_defrtr */
+	{ 0, 1 },			/* accept_ra_from_local */
+	{ 0, INT_MAX },			/* accept_ra_min_hop_limit */
+	{ 0, 1 },			/* accept_ra_mtu */
+	{ 0, 1 },			/* accept_ra_pinfo */
+	{ 0, INT_MAX },			/* accept_ra_rt_info_max_plen */
+	{ 0, 1 },			/* accept_ra_rtr_pref */
+	{ -1, 0 },			/* accept_source_route */
+	{ 0, 1 },			/* autoconf */
+	{ 0, INT_MAX },			/* dad_transmits */
+	{ 0, 1 },			/* disable_ipv6 */
+	{ 0, 1 },			/* drop_unicast_in_l2_multicast */
+	{ 0, 1 },			/* drop_unsolicited_na */
+	{ 0, 2 },			/* force_mld_version */
+	{ 0, 1 },			/* force_tllao */
+	{ 0, 1 },			/* forwarding */
+	{ 0, 1 },			/* accept_redirects */
+	{ 1, 255 },			/* hop_limit */
+	{ 0, 1 },			/* ignore_routes_with_linkdown */
+	{ -1, 1 },			/* keep_addr_on_down */
+	{ 0, MAX_ADDRESSES },		/* max_addresses */
+	{ 0, INT_MAX },			/* max_desync_factor */
+	{ 0, INT_MAX },			/* mldv1_unsolicited_report_interval */
+	{ 0, INT_MAX },			/* mldv2_unsolicited_report_interval */
 	{ IPV6_MIN_MTU, IPV6_MIN_MTU }, /* mtu */
-	{ 0, 1 }, /* ndisc_notify */
-	{ 0, 1 }, /* optimistic_dad */
-	{ 0, 1 }, /* proxy_ndp */
-	{ 0, INT_MAX }, /* regen_max_retry */
-	{ 0, ROUTER_MAX }, /* router_probe_interval */
-	{ 0, ROUTER_MAX }, /* router_solicitation_delay */
-	{ 0, ROUTER_MAX }, /* router_solicitation_interval */
-	{ 0, ROUTER_MAX }, /* router_solicitations */
-	{ 0, 1 }, /* suppress_frag_ndisc */
-	{ 0, INT_MAX }, /* temp_prefered_lft */
-	{ 0, INT_MAX }, /* temp_valid_lft */
-	{ 0, 1 }, /* use_oif_addrs_only */
-	{ 0, 1 }, /* use_optimistic */
-	{ 0, 2 }, /* use_tempaddr */
+	{ 0, 1 },			/* ndisc_notify */
+	{ 0, 1 },			/* optimistic_dad */
+	{ 0, 1 },			/* proxy_ndp */
+	{ 0, INT_MAX },			/* regen_max_retry */
+	{ 0, ROUTER_MAX },		/* router_probe_interval */
+	{ 0, ROUTER_MAX },		/* router_solicitation_delay */
+	{ 0, ROUTER_MAX },		/* router_solicitation_interval */
+	{ 0, ROUTER_MAX },		/* router_solicitations */
+	{ 0, 1 },			/* suppress_frag_ndisc */
+	{ 0, INT_MAX },			/* temp_prefered_lft */
+	{ 0, INT_MAX },			/* temp_valid_lft */
+	{ 0, 1 },			/* use_oif_addrs_only */
+	{ 0, 1 },			/* use_optimistic */
+	{ 0, 2 },			/* use_tempaddr */
 };
 
 struct test_conf {
diff --git a/test/zdtm/static/s390x_regs_check.c b/test/zdtm/static/s390x_regs_check.c
index 8d6b47997..40c480b3f 100644
--- a/test/zdtm/static/s390x_regs_check.c
+++ b/test/zdtm/static/s390x_regs_check.c
@@ -59,11 +59,11 @@ static int pipefd[2];
  */
 struct reg_set {
 	const char *name; /* Name of regset */
-	int nr; /* Number of regset */
-	void *data; /* Test data */
-	int len; /* Number of bytes of test data */
-	bool optional; /* Not all kernels/machines have this reg set */
-	bool available; /* Current kernel/machine has this reg set */
+	int nr;		  /* Number of regset */
+	void *data;	  /* Test data */
+	int len;	  /* Number of bytes of test data */
+	bool optional;	  /* Not all kernels/machines have this reg set */
+	bool available;	  /* Current kernel/machine has this reg set */
 };
 
 /*
@@ -397,8 +397,8 @@ static inline void send_tid_and_loop(int fd)
 
 	asm volatile("lgr	2,%0\n" /* Arg 1: fd */
 		     "la	3,%1\n" /* Arg 2: &tid */
-		     "lghi	4,4\n" /* Arg 3: sizeof(int) */
-		     "svc	4\n" /* __NR_write SVC: */
+		     "lghi	4,4\n"	/* Arg 3: sizeof(int) */
+		     "svc	4\n"	/* __NR_write SVC: */
 		     /* After SVC no more registers are changed */
 		     "0:	j 0b\n" /* Loop here */
 		     :
diff --git a/test/zdtm/static/session01.c b/test/zdtm/static/session01.c
index 0f727a9a6..31a617de9 100644
--- a/test/zdtm/static/session01.c
+++ b/test/zdtm/static/session01.c
@@ -40,22 +40,22 @@ enum {
 static struct testcase *testcases;
 static futex_t *fstate;
 static struct testcase __testcases[] = {
-	{ 2, 1, 2, 1, 2, 1 }, /* session00			*/
-	{ 4, 2, 4, 2, 4, 1 }, /*  |\_session00		*/
-	{ 15, 4, 4, 4, 15, 1 }, /*  |  |\_session00		*/
-	{ 16, 4, 4, 4, 15, 1 }, /*  |   \_session00		*/
-	{ 17, 4, 4, 4, 17, 0 }, /*  |  |\_session00		*/
-	{ 18, 4, 4, 4, 17, 1 }, /*  |   \_session00		*/
-	{ 5, 2, 2, 2, 2, 1 }, /*  |\_session00		*/
-	{ 8, 2, 8, 2, 8, 1 }, /*  |\_session00		*/
-	{ 9, 8, 2, 2, 2, 1 }, /*  |   \_session00		*/
-	{ 10, 2, 10, 2, 10, 1 }, /*  |\_session00		*/
+	{ 2, 1, 2, 1, 2, 1 },	  /* session00			*/
+	{ 4, 2, 4, 2, 4, 1 },	  /*  |\_session00		*/
+	{ 15, 4, 4, 4, 15, 1 },	  /*  |  |\_session00		*/
+	{ 16, 4, 4, 4, 15, 1 },	  /*  |   \_session00		*/
+	{ 17, 4, 4, 4, 17, 0 },	  /*  |  |\_session00		*/
+	{ 18, 4, 4, 4, 17, 1 },	  /*  |   \_session00		*/
+	{ 5, 2, 2, 2, 2, 1 },	  /*  |\_session00		*/
+	{ 8, 2, 8, 2, 8, 1 },	  /*  |\_session00		*/
+	{ 9, 8, 2, 2, 2, 1 },	  /*  |   \_session00		*/
+	{ 10, 2, 10, 2, 10, 1 },  /*  |\_session00		*/
 	{ 11, 10, 11, 2, 11, 1 }, /*  |    \_session00		*/
-	{ 12, 11, 2, 2, 2, 1 }, /*  |        \_session00	*/
-	{ 13, 2, 2, 2, 2, 0 }, /*   \_session00		*/
-	{ 3, 13, 2, 2, 2, 1 }, /* session00			*/
-	{ 6, 2, 6, 2, 6, 0 }, /*   \_session00		*/
-	{ 14, 6, 6, 6, 6, 1 }, /* session00			*/
+	{ 12, 11, 2, 2, 2, 1 },	  /*  |        \_session00	*/
+	{ 13, 2, 2, 2, 2, 0 },	  /*   \_session00		*/
+	{ 3, 13, 2, 2, 2, 1 },	  /* session00			*/
+	{ 6, 2, 6, 2, 6, 0 },	  /*   \_session00		*/
+	{ 14, 6, 6, 6, 6, 1 },	  /* session00			*/
 };
 
 #define TESTS (sizeof(__testcases) / sizeof(struct testcase))
diff --git a/test/zdtm/static/sigpending.c b/test/zdtm/static/sigpending.c
index 1641fdd86..ce03ff55c 100644
--- a/test/zdtm/static/sigpending.c
+++ b/test/zdtm/static/sigpending.c
@@ -18,7 +18,7 @@ static int numsig;
 #define TESTSIG	  (SIGRTMAX)
 #define THREADSIG (SIGRTMIN)
 static siginfo_t share_infos[2];
-static siginfo_t self_infos[64]; /* self */
+static siginfo_t self_infos[64];  /* self */
 static siginfo_t thread_infos[3]; /* thread */
 static int share_nr;
 static int self_nr;
diff --git a/test/zdtm/transition/ptrace.c b/test/zdtm/transition/ptrace.c
index bf6344f1c..ee10c8004 100644
--- a/test/zdtm/transition/ptrace.c
+++ b/test/zdtm/transition/ptrace.c
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 {
 	int pid, status, i, stopped;
 #define PT_REGS_SIZE  4096 /* big enough for any arch */
-#define PT_REGS_ALIGN 16 /* big enough for any arch */
+#define PT_REGS_ALIGN 16   /* big enough for any arch */
 	char regs[PT_REGS_SIZE] __attribute__((aligned(PT_REGS_ALIGN)));
 
 	int *pids;