diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2002-05-12 20:49:41 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2002-05-12 20:49:41 +0000 |
| commit | 77068a7fe2146f5edd3808696532ac3adea99df8 (patch) | |
| tree | 23b6f85553aa96d4599428d24b108a5190c99452 /sbin/fsck_ffs | |
| parent | 201efb1913e986bbb8777051dc035e4a0f5a4c02 (diff) | |
| download | src-77068a7fe2146f5edd3808696532ac3adea99df8.tar.gz src-77068a7fe2146f5edd3808696532ac3adea99df8.zip | |
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.
Notes
Notes:
svn path=/head/; revision=96475
Diffstat (limited to 'sbin/fsck_ffs')
| -rw-r--r-- | sbin/fsck_ffs/fsutil.c | 1 | ||||
| -rw-r--r-- | sbin/fsck_ffs/setup.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 65869c370f70..9f4607f67378 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -43,6 +43,7 @@ static const char rcsid[] = #include <sys/types.h> #include <sys/sysctl.h> #include <sys/stat.h> +#include <sys/disklabel.h> #include <ufs/ufs/dinode.h> #include <ufs/ufs/dir.h> diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 84fe0e54bb97..9364ce30126b 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; |