summaryrefslogtreecommitdiff
path: root/sys/adosfs
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2007-05-29 06:28:17 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2007-05-29 06:28:17 +0000
commit444b0299644e2e692c1f8d00d8b1caa0acea33a3 (patch)
tree1b53b5865bcc8b3675238c2ebdd9daf6797ccd39 /sys/adosfs
parent3f6176ec485942a0e5cfcc7e61ca01950df6452c (diff)
Updated disklabel format to support larger disks and partitions. We
free room in struct partition by packing fragment size and fragments/block more tighlty and use the resulting space to make offset and size 48 bits. For the disk part we use spare fields in struct disklabel. Kernel converts in-mem copy of the on-disk label if needed, disklabel(8) writes new version. We are careful to only change fields not used by bootloaders. Conception of basic scheme by deraadt. ok deraadt@ krw@
Diffstat (limited to 'sys/adosfs')
-rw-r--r--sys/adosfs/advfsops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c
index f26aadfbaf9..3653ccafc8d 100644
--- a/sys/adosfs/advfsops.c
+++ b/sys/adosfs/advfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: advfsops.c,v 1.25 2003/08/14 07:46:39 mickey Exp $ */
+/* $OpenBSD: advfsops.c,v 1.26 2007/05/29 06:28:16 otto Exp $ */
/* $NetBSD: advfsops.c,v 1.24 1996/12/22 10:10:12 cgd Exp $ */
/*
@@ -200,8 +200,8 @@ adosfs_mountfs(devvp, mp, p)
amp->secsperblk = 1;
}
else {
- amp->bsize = parp->p_fsize * parp->p_frag;
- amp->secsperblk = parp->p_frag;
+ amp->bsize = DISKLABELV1_FFS_BSIZE(parp->fragblock);
+ amp->secsperblk = DISKLABELV1_FFS_FRAG(parp->p_fragblock);
}
amp->rootb = (parp->p_size / amp->secsperblk - 1 + parp->p_cpg) >> 1;
amp->numblks = parp->p_size / amp->secsperblk - parp->p_cpg;