From 5d807a0e1a1c76740e5fc2bf871fb2dfb98ebe51 Mon Sep 17 00:00:00 2001
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 11 Jul 2011 05:22:31 +0000
Subject: Include sys/sbuf.h directly.

Reviewed by:	pjd
---
 sys/geom/cache/g_cache.c          | 1 +
 sys/geom/concat/g_concat.c        | 1 +
 sys/geom/eli/g_eli.c              | 1 +
 sys/geom/gate/g_gate.c            | 1 +
 sys/geom/geom_bsd.c               | 1 +
 sys/geom/geom_ccd.c               | 1 +
 sys/geom/geom_disk.c              | 1 +
 sys/geom/geom_pc98.c              | 1 +
 sys/geom/geom_sunlabel.c          | 1 +
 sys/geom/label/g_label_gpt.c      | 1 +
 sys/geom/mirror/g_mirror.c        | 1 +
 sys/geom/mountver/g_mountver.c    | 1 +
 sys/geom/multipath/g_multipath.c  | 1 +
 sys/geom/nop/g_nop.c              | 1 +
 sys/geom/raid/g_raid.c            | 1 +
 sys/geom/raid3/g_raid3.c          | 1 +
 sys/geom/sched/g_sched.c          | 1 +
 sys/geom/sched/gs_rr.c            | 1 +
 sys/geom/shsec/g_shsec.c          | 1 +
 sys/geom/stripe/g_stripe.c        | 1 +
 sys/geom/vinum/geom_vinum.c       | 1 +
 sys/geom/vinum/geom_vinum_drive.c | 2 ++
 sys/geom/vinum/geom_vinum_list.c  | 2 ++
 sys/geom/vinum/geom_vinum_subr.c  | 1 +
 sys/geom/virstor/g_virstor.c      | 1 +
 25 files changed, 27 insertions(+)

(limited to 'sys/geom')

diff --git a/sys/geom/cache/g_cache.c b/sys/geom/cache/g_cache.c
index ca05f14be513..fc3490f7eae5 100644
--- a/sys/geom/cache/g_cache.c
+++ b/sys/geom/cache/g_cache.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
+#include <sys/sbuf.h>
 #include <sys/time.h>
 #include <vm/uma.h>
 #include <geom/geom.h>
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index 54e0fe05ad32..b2196b7b40ea 100644
--- a/sys/geom/concat/g_concat.c
+++ b/sys/geom/concat/g_concat.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <geom/geom.h>
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 30497a453ea8..6941470856ab 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/eventhandler.h>
diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c
index 22338a513caa..886b9939167a 100644
--- a/sys/geom/gate/g_gate.c
+++ b/sys/geom/gate/g_gate.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/limits.h>
 #include <sys/queue.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/signalvar.h>
 #include <sys/time.h>
diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c
index c5b92520c1a8..60fc50ce6ff1 100644
--- a/sys/geom/geom_bsd.c
+++ b/sys/geom/geom_bsd.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/errno.h>
 #include <sys/disklabel.h>
 #include <sys/gpt.h>
+#include <sys/sbuf.h>
 #include <sys/uuid.h>
 #include <geom/geom.h>
 #include <geom/geom_slice.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 16593219cb4a..b2ccaba7e049 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/bio.h>
 #include <sys/malloc.h>
+#include <sys/sbuf.h>
 #include <geom/geom.h>
 
 /*
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 17cae6828f97..3072895fdc9e 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ctype.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/devicestat.h>
 #include <machine/md_var.h>
diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c
index ffc48bd2f1b4..71c194de18db 100644
--- a/sys/geom/geom_pc98.c
+++ b/sys/geom/geom_pc98.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bio.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/sbuf.h>
 
 #include <sys/diskpc98.h>
 #include <geom/geom.h>
diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index f05b7e622477..5ac35adca1b1 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/md5.h>
+#include <sys/sbuf.h>
 #include <sys/sun_disklabel.h>
 #include <geom/geom.h>
 #include <geom/geom_slice.h>
diff --git a/sys/geom/label/g_label_gpt.c b/sys/geom/label/g_label_gpt.c
index 37014959cffa..ecab01bc222f 100644
--- a/sys/geom/label/g_label_gpt.c
+++ b/sys/geom/label/g_label_gpt.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/kobj.h>
 #include <sys/gpt.h>
+#include <sys/sbuf.h>
 
 #include <geom/geom.h>
 #include <geom/label/g_label.h>
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c
index a2780d7c9634..66888643be23 100644
--- a/sys/geom/mirror/g_mirror.c
+++ b/sys/geom/mirror/g_mirror.c
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/eventhandler.h>
diff --git a/sys/geom/mountver/g_mountver.c b/sys/geom/mountver/g_mountver.c
index c6530908bd1b..b2e1a63453f7 100644
--- a/sys/geom/mountver/g_mountver.c
+++ b/sys/geom/mountver/g_mountver.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/bio.h>
 #include <sys/disk.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/eventhandler.h>
diff --git a/sys/geom/multipath/g_multipath.c b/sys/geom/multipath/g_multipath.c
index 6720a872b8ed..947cce0507be 100644
--- a/sys/geom/multipath/g_multipath.c
+++ b/sys/geom/multipath/g_multipath.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index c1a2333e223f..675f06e59cbc 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <geom/geom.h>
diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c
index 1fdd42186fa3..3c4a3f8257c6 100644
--- a/sys/geom/raid/g_raid.c
+++ b/sys/geom/raid/g_raid.c
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/eventhandler.h>
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c
index 67e44196c364..eef7c10817d3 100644
--- a/sys/geom/raid3/g_raid3.c
+++ b/sys/geom/raid3/g_raid3.c
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/eventhandler.h>
diff --git a/sys/geom/sched/g_sched.c b/sys/geom/sched/g_sched.c
index dd5120fd5e15..10102296f90a 100644
--- a/sys/geom/sched/g_sched.c
+++ b/sys/geom/sched/g_sched.c
@@ -111,6 +111,7 @@
 #include <sys/bio.h>
 #include <sys/limits.h>
 #include <sys/hash.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>		/* we access curthread */
diff --git a/sys/geom/sched/gs_rr.c b/sys/geom/sched/gs_rr.c
index 39b976a04cf1..1fc8cda3f7eb 100644
--- a/sys/geom/sched/gs_rr.c
+++ b/sys/geom/sched/gs_rr.c
@@ -59,6 +59,7 @@
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include "gs_scheduler.h"
 
diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c
index 4bf918f6db27..abf0317ba838 100644
--- a/sys/geom/shsec/g_shsec.c
+++ b/sys/geom/shsec/g_shsec.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <vm/uma.h>
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index 08841b5e66e0..bb946317d24c 100644
--- a/sys/geom/stripe/g_stripe.c
+++ b/sys/geom/stripe/g_stripe.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <vm/uma.h>
diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c
index 107b80d6f838..ab4d1a4cbcc3 100644
--- a/sys/geom/vinum/geom_vinum.c
+++ b/sys/geom/vinum/geom_vinum.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
diff --git a/sys/geom/vinum/geom_vinum_drive.c b/sys/geom/vinum/geom_vinum_drive.c
index f782fd0c721a..877eed405693 100644
--- a/sys/geom/vinum/geom_vinum_drive.c
+++ b/sys/geom/vinum/geom_vinum_drive.c
@@ -27,8 +27,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/types.h>
 #include <sys/endian.h>
 #include <sys/malloc.h>
+#include <sys/sbuf.h>
 #include <sys/systm.h>
 
 #include <geom/geom.h>
diff --git a/sys/geom/vinum/geom_vinum_list.c b/sys/geom/vinum/geom_vinum_list.c
index 00b89495b572..3d44cd4fe1ef 100644
--- a/sys/geom/vinum/geom_vinum_list.c
+++ b/sys/geom/vinum/geom_vinum_list.c
@@ -28,8 +28,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/types.h>
 #include <sys/libkern.h>
 #include <sys/malloc.h>
+#include <sys/sbuf.h>
 
 #include <geom/geom.h>
 #include <geom/vinum/geom_vinum_var.h>
diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c
index e381ff2bf597..ea7c7e7ef3fb 100644
--- a/sys/geom/vinum/geom_vinum_subr.c
+++ b/sys/geom/vinum/geom_vinum_subr.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
+#include <sys/sbuf.h>
 #include <sys/systm.h>
 
 #include <geom/geom.h>
diff --git a/sys/geom/virstor/g_virstor.c b/sys/geom/virstor/g_virstor.c
index 509aca1faf2d..e9bee5c580ee 100644
--- a/sys/geom/virstor/g_virstor.c
+++ b/sys/geom/virstor/g_virstor.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/sx.h>
 #include <sys/bio.h>
+#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/time.h>
-- 
cgit v1.2.3