ARGH! SBLOCK is not unused. Try to get this right.

BBSIZE belongs in <sys/disklabel.h> (but shouldn't be a constant).

Define SBLOCK again, using the right math.

Sponsored by: DARPA & NAI Labs.
This commit is contained in:
Poul-Henning Kamp 2002-05-12 20:21:40 +00:00
parent 7cb71b749c
commit 7110af7577
7 changed files with 14 additions and 7 deletions

View file

@ -55,9 +55,8 @@
* The first boot and super blocks are given in absolute disk addresses.
* The byte-offset forms are preferred, as they don't imply a sector size.
*/
#define BBSIZE 1024
#define SBSIZE 1024
#define SBOFF ((off_t)(BBSIZE))
#define SBLOCK 2
/*
* The path name on which the file system is mounted is maintained

View file

@ -55,9 +55,8 @@
* The first boot and super blocks are given in absolute disk addresses.
* The byte-offset forms are preferred, as they don't imply a sector size.
*/
#define BBSIZE 1024
#define SBSIZE 1024
#define SBOFF ((off_t)(BBSIZE))
#define SBLOCK 2
/*
* The path name on which the file system is mounted is maintained

View file

@ -88,6 +88,9 @@
#define MAXPARTITIONS 8
#endif
/* Size of bootblock area in sector-size neutral bytes */
#define BBSIZE 8192
#define LABEL_PART 2 /* partition containing label */
#define RAW_PART 2 /* partition containing whole disk */
#define SWAP_PART 1 /* partition normally containing swap */

View file

@ -88,6 +88,9 @@
#define MAXPARTITIONS 8
#endif
/* Size of bootblock area in sector-size neutral bytes */
#define BBSIZE 8192
#define LABEL_PART 2 /* partition containing label */
#define RAW_PART 2 /* partition containing whole disk */
#define SWAP_PART 1 /* partition normally containing swap */

View file

@ -88,6 +88,9 @@
#define MAXPARTITIONS 8
#endif
/* Size of bootblock area in sector-size neutral bytes */
#define BBSIZE 8192
#define LABEL_PART 2 /* partition containing label */
#define RAW_PART 2 /* partition containing whole disk */
#define SWAP_PART 1 /* partition normally containing swap */

View file

@ -37,6 +37,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/disklabel.h>
#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/proc.h>

View file

@ -58,12 +58,11 @@
* The beginning of cylinder group cg in fs, is given by
* the ``cgbase(fs, cg)'' macro.
*
* The first boot and super blocks are given in absolute disk addresses.
* The byte-offset forms are preferred, as they don't imply a sector size.
* The size and offset of the super-block in sector-size neutral bytes.
*/
#define BBSIZE 8192
#define SBSIZE 8192
#define SBOFF ((off_t)(BBSIZE))
#define SBLOCK ((ufs_daddr_t)(SBOFF / DEV_BSIZE))
/* Max number of fragments per block, this is not tweakable */
#define MAXFRAG 8