Date: Thu, 23 Nov 2023 16:07:54 GMT From: Mitchell Horne <mhorne@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f3dc172763ae - main - geom: sort includes for some files Message-ID: <202311231607.3ANG7sjd007311@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f3dc172763aee039c917fdba03f1e27095f5a7a9 commit f3dc172763aee039c917fdba03f1e27095f5a7a9 Author: Mitchell Horne <mhorne@FreeBSD.org> AuthorDate: 2023-11-23 15:23:07 +0000 Commit: Mitchell Horne <mhorne@FreeBSD.org> CommitDate: 2023-11-23 16:07:42 +0000 geom: sort includes for some files This is not exhaustive, just done ahead of some upcoming changes to these files. Don't include sys/cdefs.h explicitly. No functional change intended. Reviewed by: imp, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42335 --- sys/geom/journal/g_journal.c | 19 ++++++++++--------- sys/geom/mountver/g_mountver.c | 12 ++++++------ sys/geom/raid/g_raid.c | 17 +++++++++-------- sys/geom/raid3/g_raid3.c | 17 +++++++++-------- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index cfc42c120992..147e83cc7e21 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -26,34 +26,35 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> +#include <sys/bio.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> -#include <sys/module.h> +#include <sys/kthread.h> #include <sys/limits.h> #include <sys/lock.h> -#include <sys/mutex.h> -#include <sys/bio.h> -#include <sys/sysctl.h> +#include <sys/module.h> #include <sys/malloc.h> #include <sys/mount.h> -#include <sys/eventhandler.h> +#include <sys/mutex.h> #include <sys/proc.h> -#include <sys/kthread.h> +#include <sys/sbuf.h> #include <sys/sched.h> +#include <sys/sysctl.h> #include <sys/taskqueue.h> #include <sys/vnode.h> -#include <sys/sbuf.h> + #ifdef GJ_MEMDEBUG #include <sys/stack.h> #include <sys/kdb.h> #endif + #include <vm/vm.h> #include <vm/vm_kern.h> + #include <geom/geom.h> #include <geom/geom_dbg.h> - #include <geom/journal/g_journal.h> FEATURE(geom_journal, "GEOM journaling support"); diff --git a/sys/geom/mountver/g_mountver.c b/sys/geom/mountver/g_mountver.c index 00ff9dd9b7cb..de3a298735d4 100644 --- a/sys/geom/mountver/g_mountver.c +++ b/sys/geom/mountver/g_mountver.c @@ -27,20 +27,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> +#include <sys/bio.h> +#include <sys/disk.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> -#include <sys/module.h> #include <sys/lock.h> +#include <sys/malloc.h> +#include <sys/module.h> #include <sys/mutex.h> -#include <sys/bio.h> -#include <sys/disk.h> #include <sys/proc.h> #include <sys/sbuf.h> #include <sys/sysctl.h> -#include <sys/malloc.h> -#include <sys/eventhandler.h> + #include <geom/geom.h> #include <geom/geom_dbg.h> #include <geom/mountver/g_mountver.h> diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index 753c9fdbe867..437cef416ca3 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -26,25 +26,26 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> +#include <sys/bio.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> -#include <sys/module.h> +#include <sys/kthread.h> #include <sys/limits.h> #include <sys/lock.h> +#include <sys/malloc.h> +#include <sys/module.h> #include <sys/mutex.h> -#include <sys/bio.h> +#include <sys/proc.h> #include <sys/sbuf.h> +#include <sys/sched.h> #include <sys/sysctl.h> -#include <sys/malloc.h> -#include <sys/eventhandler.h> + #include <vm/uma.h> + #include <geom/geom.h> #include <geom/geom_dbg.h> -#include <sys/proc.h> -#include <sys/kthread.h> -#include <sys/sched.h> #include <geom/raid/g_raid.h> #include "g_raid_md_if.h" #include "g_raid_tr_if.h" diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 0d4ecb704aa5..8f12f14cf09b 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -26,25 +26,26 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> +#include <sys/bio.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> -#include <sys/module.h> +#include <sys/kthread.h> #include <sys/limits.h> #include <sys/lock.h> +#include <sys/malloc.h> +#include <sys/module.h> #include <sys/mutex.h> -#include <sys/bio.h> +#include <sys/proc.h> #include <sys/sbuf.h> +#include <sys/sched.h> #include <sys/sysctl.h> -#include <sys/malloc.h> -#include <sys/eventhandler.h> + #include <vm/uma.h> + #include <geom/geom.h> #include <geom/geom_dbg.h> -#include <sys/proc.h> -#include <sys/kthread.h> -#include <sys/sched.h> #include <geom/raid3/g_raid3.h> FEATURE(geom_raid3, "GEOM RAID-3 functionality");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311231607.3ANG7sjd007311>