diff options
| author |   otto <otto@openbsd.org> | 2016-09-01 09:27:06 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2016-09-01 09:27:06 +0000 |
| commit | bd7f5d491794e2d467f198d1f9404ff62b7d7690 (patch) | |
| tree | e4cb7827a0cf22766ac2ec6dc0eddcdb2ba7ebae /sbin/newfs/mkfs.c | |
| parent | retire the sparc library code (diff) | |
| download | wireguard-openbsd-bd7f5d491794e2d467f198d1f9404ff62b7d7690.tar.xz wireguard-openbsd-bd7f5d491794e2d467f198d1f9404ff62b7d7690.zip | |
Start writing the size of the cylinder group into the (unused) cpg
field of the disklabel. To be used by fsck_ffs(8) to find alternate
superblocks. ok deraadt@ krw@
Diffstat (limited to 'sbin/newfs/mkfs.c')
| -rw-r--r-- | sbin/newfs/mkfs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 10cbffdab24..0350dd220ff 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkfs.c,v 1.96 2016/03/17 05:27:10 bentley Exp $ */ +/* $OpenBSD: mkfs.c,v 1.97 2016/09/01 09:27:06 otto Exp $ */ /* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */ /* @@ -169,6 +169,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo, mode_t mfsmode, quad_t sizepb; int i, j, width, origdensity, fragsperinode, minfpg, optimalfpg; int lastminfpg, mincylgrps; + uint32_t bpg; long cylno, csfrags; char tmpbuf[100]; /* XXX this will break in about 2,500 years */ @@ -608,7 +609,10 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo, mode_t mfsmode, pp->p_fstype = FS_BSDFFS; pp->p_fragblock = DISKLABELV1_FFS_FRAGBLOCK(sblock.fs_fsize, sblock.fs_frag); - pp->p_cpg = sblock.fs_cpg; + bpg = sblock.fs_fpg / sblock.fs_frag; + while (bpg > USHRT_MAX) + bpg >>= 1; + pp->p_cpg = bpg; } /* |