summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-05-12 20:49:41 +0000
committerphk <phk@FreeBSD.org>2002-05-12 20:49:41 +0000
commit02fe70f68eeae14d8c6155c522822cd36d600068 (patch)
tree23b6f85553aa96d4599428d24b108a5190c99452 /lib
parent320493f9ebe397927d0ac2dd711de742218c0252 (diff)
downloadFreeBSD-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 'lib')
-rw-r--r--lib/libc/gen/disklabel.c4
-rw-r--r--lib/libdisk/write_disk.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index aa406d4..fcc97e5 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#define DKTYPENAMES
#include <sys/disklabel.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
#include <fcntl.h>
#include <stdio.h>
@@ -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 d87216d..8dd5c8e 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
OpenPOWER on IntegriCloud