From f5ac28745ff831ff91a1c2aedb32eedfec92d13a Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Thu, 29 May 2014 12:02:51 +0000 Subject: fsck should use the same values in checking as newfs does in creating a filesystem. fs_nspf and its derivitives like fs_spc are DEV_BSIZE values, not actual hardware disk sector values. Adjust initializations accordingly. Tweak header and man page comments to make the DEV_BSIZE'ness more obvious for future spelunkers. No-op for DEV_BSIZE (a.k.a. 512-byte) sector devices but should help checking filesystems on, e.g., 4k-byte sector devices. ok jmc@ on the man page tweaks. --- share/man/man5/fs.5 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'share/man') diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5 index b91cadf5b21..4fadc7d8dec 100644 --- a/share/man/man5/fs.5 +++ b/share/man/man5/fs.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fs.5,v 1.16 2007/06/25 16:15:29 jmc Exp $ +.\" $OpenBSD: fs.5,v 1.17 2014/05/29 12:02:50 krw Exp $ .\" $NetBSD: fs.5,v 1.3 1994/11/30 19:31:17 jtc Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)fs.5 8.2 (Berkeley) 4/19/94 .\" -.Dd $Mdocdate: June 25 2007 $ +.Dd $Mdocdate: May 29 2014 $ .Dt FS 5 .Os .Sh NAME @@ -107,12 +107,12 @@ struct fs { int32_t fs_csshift; /* csum block number (now unused) */ int32_t fs_nindir; /* value of NINDIR */ int32_t fs_inopb; /* inodes per file system block */ - int32_t fs_nspf; /* value of NSPF */ + int32_t fs_nspf; /* DEV_BSIZE sectors per frag */ /* yet another configuration parameter */ int32_t fs_optim; /* optimization preference, see below */ /* these fields are derived from the hardware */ - int32_t fs_npsect; /* # sectors/track including spares */ - int32_t fs_interleave; /* hardware sector interleave */ + int32_t fs_npsect; /* DEV_BSIZE sectors/track + spares */ + int32_t fs_interleave; /* DEV_BSIZE sector interleave */ int32_t fs_trackskew; /* sector 0 skew, per track */ /* fs_id takes the space of unused fs_headswitch and fs_trkseek fields */ int32_t fs_id[2]; /* unique filesystem id */ @@ -122,8 +122,8 @@ struct fs { int32_t fs_cgsize; /* cyl grp block size / bytes */ /* these fields are derived from the hardware */ int32_t fs_ntrak; /* tracks per cylinder */ - int32_t fs_nsect; /* sectors per track */ - int32_t fs_spc; /* sectors per cylinder */ + int32_t fs_nsect; /* DEV_BSIZE sectors per track */ + int32_t fs_spc; /* DEV_BSIZE sectors per cylinder */ /* this comes from the disk driver partitioning */ int32_t fs_ncyl; /* cylinders in file system */ /* these fields can be computed from the others */ -- cgit v1.2.3