diff options
| author |   otto <otto@openbsd.org> | 2010-04-04 14:12:12 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2010-04-04 14:12:12 +0000 |
| commit | c88f83bd0e5ae0bf238cc6e87b71cffedb6567c3 (patch) | |
| tree | 0cfac187742567633fdc8feeb132a705d39e540d | |
| parent | Adding the pod2man(1) special characters to mandoc_char(7) was a bad idea. (diff) | |
| download | wireguard-openbsd-c88f83bd0e5ae0bf238cc6e87b71cffedb6567c3.tar.xz wireguard-openbsd-c88f83bd0e5ae0bf238cc6e87b71cffedb6567c3.zip | |
In editor_add(), determine block & frag size base on the the actual fs
size chosen by the user, and not the suggested size; move to bigger
blocksize in two steps; ok krw@
| -rw-r--r-- | sbin/disklabel/editor.c | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 8796563e9f3..23a2ee6fe2c 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.230 2010/03/29 13:24:59 otto Exp $ */ +/* $OpenBSD: editor.c,v 1.231 2010/04/04 14:12:12 otto Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -654,8 +654,10 @@ cylinderalign: DL_SETPSIZE(pp, secs); DL_SETPOFFSET(pp, chunkstart); fragsize = 2048; - if (secs > 512ULL * 1024 * 1024 * 1024 / lp->d_secsize) - fragsize *= 4; + if (secs * lp->d_secsize > 128ULL * 1024 * 1024 * 1024) + fragsize *= 2; + if (secs * lp->d_secsize > 512ULL * 1024 * 1024 * 1024) + fragsize *= 2; #if defined (__sparc__) && !defined(__sparc64__) /* can't boot from > 8k boot blocks */ pp->p_fragblock = @@ -870,26 +872,29 @@ editor_add(struct disklabel *lp, char *p) DL_SETPSIZE(pp, new_size); DL_SETPOFFSET(pp, new_offset); pp->p_fstype = partno == 1 ? FS_SWAP : FS_BSDFFS; - fragsize = 2048; - if (new_size > 512ULL * 1024 * 1024 * 1024 / lp->d_secsize) - fragsize *= 4; -#if defined (__sparc__) && !defined(__sparc64__) - /* can't boot from > 8k boot blocks */ - pp->p_fragblock = - DISKLABELV1_FFS_FRAGBLOCK(partno == 0 ? 1024 : fragsize, 8); -#else - pp->p_fragblock = DISKLABELV1_FFS_FRAGBLOCK(fragsize, 8); -#endif pp->p_cpg = 1; if (get_offset(lp, partno) == 0 && - get_size(lp, partno) == 0 && - get_fstype(lp, partno) == 0 && - get_mp(lp, partno) == 0 && - get_fsize(lp, partno) == 0 && - get_bsize(lp, partno) == 0) - return; - + get_size(lp, partno) == 0) { + fragsize = 2048; + new_size = DL_GETPSIZE(pp) * lp->d_secsize; + if (new_size > 128ULL * 1024 * 1024 * 1024) + fragsize *= 2; + if (new_size > 512ULL * 1024 * 1024 * 1024) + fragsize *= 2; +#if defined (__sparc__) && !defined(__sparc64__) + /* can't boot from > 8k boot blocks */ + pp->p_fragblock = + DISKLABELV1_FFS_FRAGBLOCK(partno == 0 ? 1024 : fragsize, 8); +#else + pp->p_fragblock = DISKLABELV1_FFS_FRAGBLOCK(fragsize, 8); +#endif + if (get_fstype(lp, partno) == 0 && + get_mp(lp, partno) == 0 && + get_fsize(lp, partno) == 0 && + get_bsize(lp, partno) == 0) + return; + } /* Bailed out at some point, so effectively delete the partition. */ DL_SETPSIZE(pp, 0); } |