<sys/buf2.h>: Remove a number of unneeded #include's.
authorSascha Wildner <saw@online.de>
Sun, 28 Jul 2019 09:46:14 +0000 (11:46 +0200)
committerSascha Wildner <saw@online.de>
Sun, 28 Jul 2019 09:46:14 +0000 (11:46 +0200)
Only <sys/buf.h> is actually needed for the header.

Adjust some kernel files accordingly.

sys/kern/vfs_lock.c
sys/kern/vfs_mount.c
sys/sys/buf2.h
sys/vfs/hammer2/hammer2.h
sys/vfs/mfs/mfs_vfsops.c
sys/vfs/ufs/ffs_softdep.c

index f8da043..1e06cf1 100644 (file)
@@ -59,7 +59,7 @@
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/buf.h>
+#include <sys/spinlock2.h>
 #include <sys/sysctl.h>
 
 #include <machine/limits.h>
@@ -67,8 +67,6 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 
-#include <sys/buf2.h>
-
 #define VACT_MAX       10
 #define VACT_INC       2
 
index d63b7f0..b3e833d 100644 (file)
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/buf.h>
+#include <sys/spinlock2.h>
 #include <sys/eventhandler.h>
 #include <sys/kthread.h>
 #include <sys/sysctl.h>
 
 #include <machine/limits.h>
 
-#include <sys/buf2.h>
-
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 
index b37fb7e..7148bbd 100644 (file)
@@ -33,7 +33,6 @@
  *
  *     @(#)buf.h       8.9 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/sys/buf.h,v 1.88.2.10 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/sys/buf2.h,v 1.21 2008/01/28 07:19:06 nth Exp $
  */
 
 #ifndef _SYS_BUF2_H_
 #ifdef _KERNEL
 
 #ifndef _SYS_BUF_H_
-#include <sys/buf.h>           /* crit_*() functions */
-#endif
-#ifndef _SYS_GLOBALDATA_H_
-#include <sys/globaldata.h>    /* curthread */
-#endif
-#ifndef _SYS_THREAD2_H_
-#include <sys/thread2.h>       /* crit_*() functions */
-#endif
-#ifndef _SYS_SPINLOCK2_H_
-#include <sys/spinlock2.h>     /* crit_*() functions */
+#include <sys/buf.h>
 #endif
 #ifndef _SYS_MOUNT_H_
 #include <sys/mount.h>
index 234aa4b..43b8eb5 100644 (file)
@@ -80,6 +80,7 @@
 #include <sys/proc.h>
 #include <sys/mountctl.h>
 #include <sys/priv.h>
+#include <sys/spinlock2.h>
 #include <sys/stat.h>
 #include <sys/thread.h>
 #include <sys/globaldata.h>
index c83eee8..bf8c02b 100644 (file)
@@ -41,6 +41,7 @@
 #include <sys/mount.h>
 #include <sys/signalvar.h>
 #include <sys/signal2.h>
+#include <sys/spinlock2.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/sysproto.h>
index 7383c55..83a40ed 100644 (file)
@@ -56,6 +56,7 @@
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
+#include <sys/spinlock2.h>
 #include <sys/syslog.h>
 #include <sys/vnode.h>
 #include <sys/conf.h>