From 77068a7fe2146f5edd3808696532ac3adea99df8 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Sun, 12 May 2002 20:49:41 +0000 Subject: Retire the bogus uses of the disklabel field d_sbsize and begin to initialize it to zero so we don't have to have everbody and their aunt including FFS specific header files. Sponsored by: DARPA & NAI Labs. --- lib/libc/gen/disklabel.c | 4 +--- lib/libdisk/write_disk.c | 2 +- sbin/bsdlabel/bsdlabel.c | 8 +------- sbin/disklabel/disklabel.c | 8 +------- sbin/fsck_ffs/fsutil.c | 1 + sbin/fsck_ffs/setup.c | 3 --- sbin/fsck_ifs/fsutil.c | 1 + sbin/fsck_ifs/setup.c | 3 --- sys/dev/ccd/ccd.c | 3 +-- sys/dev/vinum/vinumhdr.h | 1 - sys/dev/vinum/vinumio.c | 2 +- sys/geom/geom_ccd.c | 3 +-- sys/kern/subr_diskslice.c | 6 +----- 13 files changed, 10 insertions(+), 35 deletions(-) diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c index aa406d48356d3..fcc97e521cdfd 100644 --- a/lib/libc/gen/disklabel.c +++ b/lib/libc/gen/disklabel.c @@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$"); #include #define DKTYPENAMES #include -#include -#include #include #include @@ -118,7 +116,7 @@ getdiskbyname(const char *name) getnumdflt(dp->d_headswitch, "hs", 0); getnumdflt(dp->d_trkseek, "ts", 0); getnumdflt(dp->d_bbsize, "bs", BBSIZE); - getnumdflt(dp->d_sbsize, "sb", SBSIZE); + getnumdflt(dp->d_sbsize, "sb", 0); strcpy(psize, "px"); strcpy(pbsize, "bx"); strcpy(pfsize, "fx"); diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c index d87216d70ef3c..8dd5c8e303f4b 100644 --- a/lib/libdisk/write_disk.c +++ b/lib/libdisk/write_disk.c @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$"); #define DOSPTYP_EXTENDED 5 #define BBSIZE 8192 -#define SBSIZE 8192 +#define SBSIZE 0 #define DEF_RPM 3600 #define DEF_INTERLEAVE 1 diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 122d778431d0a..90423bb5c4945 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -64,7 +64,6 @@ static const char rcsid[] = #ifdef __sparc64__ #include #endif -#include #include #include #include @@ -937,7 +936,7 @@ getasciilabel(FILE *f, struct disklabel *lp) int i; lp->d_bbsize = BBSIZE; /* XXX */ - lp->d_sbsize = SBSIZE; /* XXX */ + lp->d_sbsize = 0; /* XXX */ while (fgets(line, sizeof(line) - 1, f)) { lineno++; if ((cp = index(line,'\n')) != 0) @@ -1332,11 +1331,6 @@ checklabel(struct disklabel *lp) errors++; } else if (lp->d_bbsize % lp->d_secsize) Warning("boot block size %% sector-size != 0"); - if (lp->d_sbsize == 0) { - fprintf(stderr, "super block size 0\n"); - errors++; - } else if (lp->d_sbsize % lp->d_secsize) - Warning("super block size %% sector-size != 0"); if (lp->d_npartitions > MAXPARTITIONS) Warning("number of partitions (%lu) > MAXPARTITIONS (%d)", (u_long)lp->d_npartitions, MAXPARTITIONS); diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 122d778431d0a..90423bb5c4945 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -64,7 +64,6 @@ static const char rcsid[] = #ifdef __sparc64__ #include #endif -#include #include #include #include @@ -937,7 +936,7 @@ getasciilabel(FILE *f, struct disklabel *lp) int i; lp->d_bbsize = BBSIZE; /* XXX */ - lp->d_sbsize = SBSIZE; /* XXX */ + lp->d_sbsize = 0; /* XXX */ while (fgets(line, sizeof(line) - 1, f)) { lineno++; if ((cp = index(line,'\n')) != 0) @@ -1332,11 +1331,6 @@ checklabel(struct disklabel *lp) errors++; } else if (lp->d_bbsize % lp->d_secsize) Warning("boot block size %% sector-size != 0"); - if (lp->d_sbsize == 0) { - fprintf(stderr, "super block size 0\n"); - errors++; - } else if (lp->d_sbsize % lp->d_secsize) - Warning("super block size %% sector-size != 0"); if (lp->d_npartitions > MAXPARTITIONS) Warning("number of partitions (%lu) > MAXPARTITIONS (%d)", (u_long)lp->d_npartitions, MAXPARTITIONS); diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 65869c370f708..9f4607f673788 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -43,6 +43,7 @@ static const char rcsid[] = #include #include #include +#include #include #include diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 84fe0e54bb976..9364ce30126ba 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -506,9 +506,6 @@ calcsb(char *dev, int devfd, struct fs *fs) fs->fs_nsect = lp->d_nsectors; fs->fs_spc = lp->d_secpercyl; fs->fs_nspf = fs->fs_fsize / lp->d_secsize; - fs->fs_sblkno = roundup( - howmany(lp->d_bbsize + lp->d_sbsize, fs->fs_fsize), - fs->fs_frag); fs->fs_cgmask = 0xffffffff; for (i = fs->fs_ntrak; i > 1; i >>= 1) fs->fs_cgmask <<= 1; diff --git a/sbin/fsck_ifs/fsutil.c b/sbin/fsck_ifs/fsutil.c index 465452fb9c1d5..5b6faba9eb3da 100644 --- a/sbin/fsck_ifs/fsutil.c +++ b/sbin/fsck_ifs/fsutil.c @@ -42,6 +42,7 @@ static const char rcsid[] = #include #include #include +#include #include #include diff --git a/sbin/fsck_ifs/setup.c b/sbin/fsck_ifs/setup.c index a55502887e55d..f60f9ce11c71d 100644 --- a/sbin/fsck_ifs/setup.c +++ b/sbin/fsck_ifs/setup.c @@ -481,9 +481,6 @@ calcsb(char *dev, int devfd, struct fs *fs) fs->fs_nsect = lp->d_nsectors; fs->fs_spc = lp->d_secpercyl; fs->fs_nspf = fs->fs_fsize / lp->d_secsize; - fs->fs_sblkno = roundup( - howmany(lp->d_bbsize + lp->d_sbsize, fs->fs_fsize), - fs->fs_frag); fs->fs_cgmask = 0xffffffff; for (i = fs->fs_ntrak; i > 1; i >>= 1) fs->fs_cgmask <<= 1; diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index c9c9fa118e6db..bdb4043bd9598 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -99,7 +99,6 @@ #include #include #include -#include #include #include #include @@ -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 c5f7ab385b113..95aa6fe3059ee 100644 --- a/sys/dev/vinum/vinumhdr.h +++ b/sys/dev/vinum/vinumhdr.h @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c index 0b9fb96298ba3..bcf2908b502e2 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; diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index c9c9fa118e6db..bdb4043bd9598 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -99,7 +99,6 @@ #include #include #include -#include #include #include #include @@ -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/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 158ccbb80a3af..9259bf8124fc1 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -59,8 +59,6 @@ #include #include -#include - #define TRACE(str) do { if (ds_debug) printf str; } while (0) typedef u_char bool_t; @@ -113,8 +111,6 @@ clone_label(lp) lp1->d_npartitions = MAXPARTITIONS; if (lp1->d_bbsize == 0) lp1->d_bbsize = BBSIZE; - if (lp1->d_sbsize == 0) - lp1->d_sbsize = SBSIZE; lp1->d_partitions[RAW_PART].p_size = lp1->d_secperunit; lp1->d_magic = DISKMAGIC; lp1->d_magic2 = DISKMAGIC; @@ -394,7 +390,7 @@ dsioctl(dev, cmd, data, flags, sspp) lp->d_ntracks = 64; lp->d_bbsize = BBSIZE; - lp->d_sbsize = SBSIZE; + lp->d_sbsize = 0; lp->d_secpercyl = lp->d_nsectors * lp->d_ntracks; lp->d_ncylinders = sp->ds_size / lp->d_secpercyl; lp->d_secperunit = sp->ds_size; -- cgit v1.3