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 /sys | |
| 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 'sys')
| -rw-r--r-- | sys/dev/ccd/ccd.c | 3 | ||||
| -rw-r--r-- | sys/dev/vinum/vinumhdr.h | 1 | ||||
| -rw-r--r-- | sys/dev/vinum/vinumio.c | 2 | ||||
| -rw-r--r-- | sys/geom/geom_ccd.c | 3 | ||||
| -rw-r--r-- | sys/kern/subr_diskslice.c | 6 |
5 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index c9c9fa1..bdb4043 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 c5f7ab3..95aa6fe 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 0b9fb96..bcf2908 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 c9c9fa1..bdb4043 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_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/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 158ccbb..9259bf8 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -59,8 +59,6 @@ #include <sys/syslog.h> #include <sys/vnode.h> -#include <ufs/ffs/fs.h> - #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; |
