aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-05-12 20:49:41 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-05-12 20:49:41 +0000
commit77068a7fe2146f5edd3808696532ac3adea99df8 (patch)
tree23b6f85553aa96d4599428d24b108a5190c99452 /sys/dev
parent201efb1913e986bbb8777051dc035e4a0f5a4c02 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ccd/ccd.c3
-rw-r--r--sys/dev/vinum/vinumhdr.h1
-rw-r--r--sys/dev/vinum/vinumio.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index c9c9fa118e6d..bdb4043bd959 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -99,7 +99,6 @@
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/disk.h>
-#include <ufs/ffs/fs.h>
#include <sys/devicestat.h>
#include <sys/fcntl.h>
#include <sys/vnode.h>
@@ -1662,7 +1661,7 @@ ccdgetdisklabel(dev_t dev)
lp->d_npartitions = RAW_PART + 1;
lp->d_bbsize = BBSIZE; /* XXX */
- lp->d_sbsize = SBSIZE; /* XXX */
+ lp->d_sbsize = 0;
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index c5f7ab385b11..95aa6fe3059e 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -60,7 +60,6 @@
#include <sys/stat.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
-#include <ufs/ffs/fs.h>
#include <sys/syslog.h>
#include <sys/fcntl.h>
#include <sys/queue.h>
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 0b9fb96298ba..bcf2908b502e 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -752,7 +752,7 @@ get_volume_label(char *name, int plexes, u_int64_t size, struct disklabel *lp)
lp->d_secperunit = size; /* data sectors per unit */
lp->d_bbsize = BBSIZE;
- lp->d_sbsize = SBSIZE;
+ lp->d_sbsize = 0;
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;