diff options
| author | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-03-19 13:27:48 +0000 |
|---|---|---|
| committer | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-03-19 13:27:48 +0000 |
| commit | 8aee7db6c25d6479509af36b682b28c5e51add21 (patch) | |
| tree | 8aa84069967cc178e9c2feece75ade70fdc160f4 /sbin/scan_ffs | |
| parent | af8c22017b5c85a3079120a0f1984f96424c04f8 (diff) | |
Add FFS2 fields to the superblock, change file system tools to keep
accessing FFS1 fields, okay art@, quite some testing by ckuethe@, simon@
and thib@, thanks.
Diffstat (limited to 'sbin/scan_ffs')
| -rw-r--r-- | sbin/scan_ffs/scan_ffs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sbin/scan_ffs/scan_ffs.c b/sbin/scan_ffs/scan_ffs.c index e1ba6ff0420..c6645d6867d 100644 --- a/sbin/scan_ffs/scan_ffs.c +++ b/sbin/scan_ffs/scan_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scan_ffs.c,v 1.12 2006/06/28 19:17:56 pedro Exp $ */ +/* $OpenBSD: scan_ffs.c,v 1.13 2007/03/19 13:27:47 pedro Exp $ */ /* * Copyright (c) 1998 Niklas Hallqvist, Tobias Weingartner @@ -71,12 +71,12 @@ ufsscan(int fd, daddr_t beg, daddr_t end, int flags) if (flags & FLAG_VERBOSE) printf("block %d id %x,%x size %d\n", blk + (n/512), sb->fs_id[0], - sb->fs_id[1], sb->fs_size); + sb->fs_id[1], sb->fs_ffs1_size); if (((blk+(n/512)) - lastblk) == (SBSIZE/512)) { if (flags & FLAG_LABELS ) { printf("X: %d %d 4.2BSD %d %d %d # %s\n", - (daddr_t)((off_t)sb->fs_size * + (daddr_t)((off_t)sb->fs_ffs1_size * sb->fs_fsize / 512), blk+(n/512)-(2*SBSIZE/512), sb->fs_fsize, sb->fs_bsize, @@ -85,13 +85,13 @@ ufsscan(int fd, daddr_t beg, daddr_t end, int flags) printf("ffs at %d size %lld " "mount %s time %s", blk+(n/512)-(2*SBSIZE/512), - (long long)(off_t)sb->fs_size * + (long long)(off_t)sb->fs_ffs1_size * sb->fs_fsize, - lastmount, ctime(&sb->fs_time)); + lastmount, ctime(&sb->fs_ffs1_time)); } if (flags & FLAG_SMART) { - off_t size = (off_t)sb->fs_size * + off_t size = (off_t)sb->fs_ffs1_size * sb->fs_fsize; if ((n + size) < (SBSIZE * SBCOUNT)) |