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/fsck_ffs/utilities.c | |
| 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/fsck_ffs/utilities.c')
| -rw-r--r-- | sbin/fsck_ffs/utilities.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c index 96fa0637a81..8841eac111a 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utilities.c,v 1.31 2007/02/13 20:37:07 otto Exp $ */ +/* $OpenBSD: utilities.c,v 1.32 2007/03/19 13:27:47 pedro Exp $ */ /* $NetBSD: utilities.c,v 1.18 1996/09/27 22:45:20 christos Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)utilities.c 8.1 (Berkeley) 6/5/93"; #else -static const char rcsid[] = "$OpenBSD: utilities.c,v 1.31 2007/02/13 20:37:07 otto Exp $"; +static const char rcsid[] = "$OpenBSD: utilities.c,v 1.32 2007/03/19 13:27:47 pedro Exp $"; #endif #endif /* not lint */ @@ -227,7 +227,7 @@ flush(int fd, struct bufarea *bp) return; for (i = 0, j = 0; i < sblock.fs_cssize; i += sblock.fs_bsize, j++) { bwrite(fswritefd, (char *)sblock.fs_csp + i, - fsbtodb(&sblock, sblock.fs_csaddr + j * sblock.fs_frag), + fsbtodb(&sblock, sblock.fs_ffs1_csaddr + j * sblock.fs_frag), sblock.fs_cssize - i < sblock.fs_bsize ? sblock.fs_cssize - i : sblock.fs_bsize); } @@ -261,7 +261,8 @@ ckfini(int markclean) sigprocmask(SIG_SETMASK, &oset, NULL); return; } - sblock.fs_flags &= ~FS_FLAGS_UPDATED; /* Force update on next mount */ + /* Force update on next mount */ + sblock.fs_ffs1_flags &= ~FS_FLAGS_UPDATED; flush(fswritefd, &sblk); if (havesb && sblk.b_bno != SBOFF / dev_bsize && !preen && reply("UPDATE STANDARD SUPERBLOCK")) { |