ufs: Sort includes.

No functional change intended.

Preparation for:

PR kern/58378: Kernel error code origination lacks dtrace probes

Author: riastradh

sys/ufs/ufs/dirhash.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: dirhash.h,v 1.9 2021/08/19 20:56:36 andvar Exp $	*/
+/*	$NetBSD: dirhash.h,v 1.10 2026/01/22 03:23:36 riastradh Exp $	*/
 
 /*
  * Copyright (c) 2001 Ian Dowse.  All rights reserved.
@@ -30,6 +30,16 @@
 #ifndef _UFS_UFS_DIRHASH_H_
 #define _UFS_UFS_DIRHASH_H_
 
+#include <sys/types.h>
+
+#include <sys/mutex.h>
+#include <sys/queue.h>
+
+#include <ufs/ufs/dir.h>
+
+struct direct;
+struct inode;
+
 /*
  * For fast operations on large directories, we maintain a hash
  * that maps the file name to the offset of the directory entry within

sys/ufs/ufs/quota1_subr.c

@@ -1,4 +1,4 @@
-/* $NetBSD: quota1_subr.c,v 1.8 2023/02/22 21:49:45 riastradh Exp $ */
+/* $NetBSD: quota1_subr.c,v 1.9 2026/01/22 03:23:36 riastradh Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * All rights reserved.
@@ -26,12 +26,14 @@
   */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: quota1_subr.c,v 1.8 2023/02/22 21:49:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: quota1_subr.c,v 1.9 2026/01/22 03:23:36 riastradh Exp $");
 
 #include <sys/types.h>
-#include <machine/limits.h>
 
 #include <sys/quota.h>
+
+#include <machine/limits.h>
+
 #include <ufs/ufs/quota1.h>
 
 static uint64_t

sys/ufs/ufs/quota2_subr.c

@@ -1,4 +1,4 @@
-/* $NetBSD: quota2_subr.c,v 1.7 2023/08/24 14:56:03 andvar Exp $ */
+/* $NetBSD: quota2_subr.c,v 1.8 2026/01/22 03:23:36 riastradh Exp $ */
 /*-
   * Copyright (c) 2010, 2011 Manuel Bouyer
   * All rights reserved.
@@ -26,16 +26,16 @@
   */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.7 2023/08/24 14:56:03 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.8 2026/01/22 03:23:36 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
-#include <ufs/ufs/ufs_bswap.h>
+#include <ufs/ffs/fs.h>
+#include <ufs/ufs/dinode.h>
 #include <ufs/ufs/quota2.h>
+#include <ufs/ufs/ufs_bswap.h>
 
 #ifndef _KERNEL
 #include <string.h>

sys/ufs/ufs/ufs_acl.c

@@ -36,7 +36,7 @@
 #if 0
 __FBSDID("$FreeBSD: head/sys/ufs/ufs/ufs_acl.c 356669 2020-01-13 02:31:51Z mjg $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: ufs_acl.c,v 1.5 2023/02/22 21:49:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_acl.c,v 1.6 2026/01/22 03:23:36 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -45,25 +45,26 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_acl.c,v 1.5 2023/02/22 21:49:45 riastradh Exp $"
 #endif
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <sys/vnode.h>
-#include <sys/wapbl.h>
 #include <sys/types.h>
+
 #include <sys/acl.h>
 #include <sys/event.h>
 #include <sys/extattr.h>
+#include <sys/mount.h>
 #include <sys/proc.h>
+#include <sys/stat.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
+#include <sys/wapbl.h>
 
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
 #include <ufs/ufs/acl.h>
-#include <ufs/ufs/extattr.h>
 #include <ufs/ufs/dir.h>
-#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/extattr.h>
+#include <ufs/ufs/inode.h>
+#include <ufs/ufs/quota.h>
 #include <ufs/ufs/ufs_extern.h>
 #include <ufs/ufs/ufs_wapbl.h>
+#include <ufs/ufs/ufsmount.h>
 
 #include <ufs/ffs/fs.h>
 

sys/ufs/ufs/ufs_bmap.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_bmap.c,v 1.54 2022/11/17 06:40:40 chs Exp $	*/
+/*	$NetBSD: ufs_bmap.c,v 1.55 2026/01/22 03:23:36 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993
@@ -37,23 +37,25 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_bmap.c,v 1.54 2022/11/17 06:40:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_bmap.c,v 1.55 2026/01/22 03:23:36 riastradh Exp $");
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/types.h>
+
 #include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/mount.h>
+#include <sys/proc.h>
 #include <sys/resourcevar.h>
+#include <sys/systm.h>
 #include <sys/trace.h>
+#include <sys/vnode.h>
 
 #include <miscfs/specfs/specdev.h>
 
 #include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
 #include <ufs/ufs/ufs_bswap.h>
+#include <ufs/ufs/ufs_extern.h>
+#include <ufs/ufs/ufsmount.h>
 
 static bool
 ufs_issequential(const struct ufsmount *ump, daddr_t daddr0, daddr_t daddr1)

sys/ufs/ufs/ufs_dirhash.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_dirhash.c,v 1.41 2022/08/07 02:33:47 simonb Exp $	*/
+/*	$NetBSD: ufs_dirhash.c,v 1.42 2026/01/22 03:23:36 riastradh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Ian Dowse.  All rights reserved.
@@ -28,32 +28,33 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_dirhash.c,v 1.41 2022/08/07 02:33:47 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_dirhash.c,v 1.42 2026/01/22 03:23:36 riastradh Exp $");
 
 /*
  * This implements a hash-based lookup scheme for UFS directories.
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/kmem.h>
 #include <sys/types.h>
-#include <sys/hash.h>
-#include <sys/proc.h>
+
+#include <sys/atomic.h>
 #include <sys/buf.h>
-#include <sys/vnode.h>
+#include <sys/hash.h>
+#include <sys/kernel.h>
+#include <sys/kmem.h>
 #include <sys/mount.h>
 #include <sys/pool.h>
+#include <sys/proc.h>
 #include <sys/sysctl.h>
-#include <sys/atomic.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
 
-#include <ufs/ufs/inode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/dirhash.h>
-#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ufs/ufs_extern.h>
+#include <ufs/ufs/ufsmount.h>
 
 
 /*

sys/ufs/ufs/ufs_extattr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_extattr.c,v 1.55 2024/02/10 18:43:53 andvar Exp $	*/
+/*	$NetBSD: ufs_extattr.c,v 1.56 2026/01/22 03:23:36 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1999-2002 Robert N. M. Watson
@@ -48,34 +48,36 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_extattr.c,v 1.55 2024/02/10 18:43:53 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_extattr.c,v 1.56 2026/01/22 03:23:36 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ffs.h"
 #endif
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/reboot.h>
+#include <sys/types.h>
+
+#include <sys/dirent.h>
+#include <sys/extattr.h>
+#include <sys/fcntl.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
-#include <sys/namei.h>
 #include <sys/kmem.h>
-#include <sys/fcntl.h>
+#include <sys/lock.h>
 #include <sys/lwp.h>
-#include <sys/vnode.h>
 #include <sys/mount.h>
-#include <sys/lock.h>
-#include <sys/dirent.h>
-#include <sys/extattr.h>
+#include <sys/namei.h>
+#include <sys/reboot.h>
 #include <sys/sysctl.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
 
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/extattr.h>
-#include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ufs/ufs_extern.h>
+#include <ufs/ufs/ufsmount.h>
 
 int ufs_extattr_sync = 1;
 int ufs_extattr_autocreate = 1024;

sys/ufs/ufs/ufs_inode.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_inode.c,v 1.112 2020/09/05 16:30:13 riastradh Exp $	*/
+/*	$NetBSD: ufs_inode.c,v 1.113 2026/01/22 03:23:36 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -37,36 +37,38 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.112 2020/09/05 16:30:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.113 2026/01/22 03:23:36 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.h"
-#include "opt_wapbl.h"
 #include "opt_uvmhist.h"
+#include "opt_wapbl.h"
 #endif
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
+#include <sys/types.h>
+
+#include <sys/kauth.h>
 #include <sys/kernel.h>
+#include <sys/kmem.h>
+#include <sys/mount.h>
 #include <sys/namei.h>
-#include <sys/kauth.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
 #include <sys/wapbl.h>
-#include <sys/kmem.h>
 
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_wapbl.h>
 #ifdef UFS_DIRHASH
 #include <ufs/ufs/dirhash.h>
 #endif
 #ifdef UFS_EXTATTR
 #include <ufs/ufs/extattr.h>
 #endif
+#include <ufs/ufs/inode.h>
+#include <ufs/ufs/ufs_extern.h>
+#include <ufs/ufs/ufs_wapbl.h>
+#include <ufs/ufs/ufsmount.h>
 
 #ifdef UVMHIST
 #include <uvm/uvm.h>

sys/ufs/ufs/ufs_lookup.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_lookup.c,v 1.159 2024/09/08 09:36:52 rillig Exp $	*/
+/*	$NetBSD: ufs_lookup.c,v 1.160 2026/01/22 03:23:36 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,35 +37,37 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.159 2024/09/08 09:36:52 rillig Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.160 2026/01/22 03:23:36 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ffs.h"
 #endif
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/namei.h>
+#include <sys/types.h>
+
 #include <sys/buf.h>
 #include <sys/file.h>
-#include <sys/stat.h>
+#include <sys/kauth.h>
+#include <sys/kernel.h>
+#include <sys/kmem.h>
 #include <sys/mount.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/stat.h>
+#include <sys/systm.h>
 #include <sys/vnode.h>
-#include <sys/kernel.h>
-#include <sys/kauth.h>
 #include <sys/wapbl.h>
-#include <sys/proc.h>
-#include <sys/kmem.h>
 
-#include <ufs/ufs/inode.h>
 #include <ufs/ufs/dir.h>
 #ifdef UFS_DIRHASH
 #include <ufs/ufs/dirhash.h>
 #endif
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufs_bswap.h>
+#include <ufs/ufs/ufs_extern.h>
 #include <ufs/ufs/ufs_wapbl.h>
+#include <ufs/ufs/ufsmount.h>
 
 #include <miscfs/genfs/genfs.h>