diff options
| author | marcel <marcel@FreeBSD.org> | 2003-01-10 06:59:34 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2003-01-10 06:59:34 +0000 |
| commit | 111c003344a3e32cbca74ee0f32ec2bafeb74905 (patch) | |
| tree | 804d392094b2faa6123e80a501b811b8be675757 /sys/ufs | |
| parent | 90d9ad7de531393e8e1b9f53da80f5a0a21fd151 (diff) | |
| download | FreeBSD-src-111c003344a3e32cbca74ee0f32ec2bafeb74905.zip FreeBSD-src-111c003344a3e32cbca74ee0f32ec2bafeb74905.tar.gz | |
o Improve wording of the comment that accompanies fs_pad. The
padding is not specific to non-i386 architectures. It is
caused by non-i386 specific alignment requirements of
fs_swuid,
o Add a CTASSERT to catch a change in the size of struct fs
at compile-time rather than run-time.
Ok'd: gordon
Tested on: i386 ia64
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/fs.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index c11aed7..a441693 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -312,7 +312,7 @@ struct fs { u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */ u_char fs_volname[MAXVOLLEN]; /* volume name */ u_int64_t fs_swuid; /* system-wide uid */ - int32_t fs_pad; /* padding for non-i386 */ + int32_t fs_pad; /* due to alignment of fs_swuid */ /* these fields retain the current block allocation info */ int32_t fs_cgrotor; /* last cg searched */ void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */ @@ -351,6 +351,11 @@ struct fs { int32_t fs_magic; /* magic number */ }; +/* Sanity checking. */ +#ifdef CTASSERT +CTASSERT(sizeof(struct fs) == 1376); +#endif + /* * Filesystem identification */ |
