summaryrefslogtreecommitdiffstats
path: root/sbin/fsck_ffs
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 /sbin/fsck_ffs
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 'sbin/fsck_ffs')
-rw-r--r--sbin/fsck_ffs/fsutil.c1
-rw-r--r--sbin/fsck_ffs/setup.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 65869c3..9f4607f 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 84fe0e5..9364ce3 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;
OpenPOWER on IntegriCloud