From c03589fd7b43fd0b9855db827deffefcbcc61354 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 30 Mar 2017 06:13:54 +0000
Subject: [PATCH] MFC r316050,r316051:

r316050:

ctld: sort #includes per style(9)

- Only include sys/types.h or sys/param.h, not both.
- Sort alphabetically.

r316051:

ctldadm: sort #includes per style(9)

- Only include sys/types.h or sys/param.h, not both.
- Sort alphabetically.


git-svn-id: svn://svn.freebsd.org/base/stable/10@316253 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/ctladm/ctladm.c | 23 +++++++++++------------
 usr.sbin/ctld/kernel.c   |  9 ++++-----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index ec0a322b2..6a85c68cf 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -43,25 +43,24 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/callout.h>
+#include <sys/ioctl.h>
 #include <sys/linker.h>
 #include <sys/queue.h>
-#include <sys/callout.h>
 #include <sys/sbuf.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <sys/stat.h>
+#include <bsdxml.h>
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <string.h>
-#include <errno.h>
-#include <err.h>
-#include <ctype.h>
-#include <bsdxml.h>
+#include <unistd.h>
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/ctl/ctl.h>
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index ef0534f7c..940a4c3fe 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -37,15 +37,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/capsicum.h>
+#include <sys/callout.h>
+#include <sys/ioctl.h>
 #include <sys/linker.h>
 #include <sys/queue.h>
-#include <sys/callout.h>
 #include <sys/sbuf.h>
-#include <sys/capsicum.h>
+#include <sys/stat.h>
 #include <assert.h>
 #include <bsdxml.h>
 #include <ctype.h>
-- 
2.45.0