diff options
author | phk <phk@FreeBSD.org> | 2003-04-13 09:02:06 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2003-04-13 09:02:06 +0000 |
commit | 03b1ca36baf4bd8325f619d97a48764fc6dced85 (patch) | |
tree | 7e373e1543fdcdee14db44b0c4513544d165797c /sys/geom/geom_slice.c | |
parent | 0f2f76bb732fd63d44ad2f323b86acb6c93a7230 (diff) | |
download | FreeBSD-src-03b1ca36baf4bd8325f619d97a48764fc6dced85.zip FreeBSD-src-03b1ca36baf4bd8325f619d97a48764fc6dced85.tar.gz |
Time has run from the "run GEOM in userland" harness, and the new regression
test is built to test GEOM as running in the kernel.
This commit is basically "unifdef -D_KERNEL" to remove the mainly #include
related code to support the userland-harness.
Diffstat (limited to 'sys/geom/geom_slice.c')
-rw-r--r-- | sys/geom/geom_slice.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c index 882ddb0..878e93d 100644 --- a/sys/geom/geom_slice.c +++ b/sys/geom/geom_slice.c @@ -37,14 +37,6 @@ #include <sys/param.h> -#ifndef _KERNEL -#include <stdio.h> -#include <unistd.h> -#include <stdlib.h> -#include <signal.h> -#include <string.h> -#include <err.h> -#else #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> @@ -54,7 +46,6 @@ #include <sys/kthread.h> #include <sys/lock.h> #include <sys/mutex.h> -#endif #include <sys/errno.h> #include <sys/sbuf.h> #include <geom/geom.h> @@ -220,7 +211,6 @@ g_slice_start(struct bio *bp) /* Give the real method a chance to override */ if (gsp->start(bp)) return; -#ifdef _KERNEL if (!strcmp("GEOM::kerneldump", bp->bio_attribute)) { struct g_kerneldump *gkd; @@ -230,7 +220,6 @@ g_slice_start(struct bio *bp) gkd->length = gsp->slices[idx].length; /* now, pass it on downwards... */ } -#endif bp2 = g_clone_bio(bp); if (bp2 == NULL) { g_io_deliver(bp, ENOMEM); |