diff options
| author | phk <phk@FreeBSD.org> | 2002-05-12 20:49:41 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-05-12 20:49:41 +0000 |
| commit | 02fe70f68eeae14d8c6155c522822cd36d600068 (patch) | |
| tree | 23b6f85553aa96d4599428d24b108a5190c99452 /sbin/disklabel | |
| parent | 320493f9ebe397927d0ac2dd711de742218c0252 (diff) | |
| download | FreeBSD-src-02fe70f68eeae14d8c6155c522822cd36d600068.zip FreeBSD-src-02fe70f68eeae14d8c6155c522822cd36d600068.tar.gz | |
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.
Diffstat (limited to 'sbin/disklabel')
| -rw-r--r-- | sbin/disklabel/disklabel.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 122d778..90423bb 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -64,7 +64,6 @@ static const char rcsid[] = #ifdef __sparc64__ #include <sys/sun_disklabel.h> #endif -#include <ufs/ffs/fs.h> #include <unistd.h> #include <string.h> #include <stdio.h> @@ -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); |
