53fcdb2d1a
-T (track size) or -H (number of heads) is given:
o scheme_metadata() always rounded to the block size. This is not
always valid (e.g. vtoc8 that must have partitions start at cylinder
boundaries).
o The bsd and vtoc8 schemes "resized" the image to make it match the
geometry, but since the geometry is an approximation and the size
of the image computed from cylinders * heads * sectors is always
smaller than the original image size, the partition information ran
out of bounds.
The fix is to have scheme_metadata() simply pass it's arguments to the
per-scheme metadata callback, so that schemes not only know where the
metadata is to go, but also what the current block address is. It's now
up to the per-scheme callback to reserve room for metadata and to make
sure alignment and rounding is applied.
The BSD scheme now has the most elaborate alignment and rounding. Just
to make the point: partitions are aligned on block boundaries, but the
image is rounded to the next cyclinder boundary.
vtoc8 now properly has all partitions aligned (and rounded) to the
cyclinder boundary.
Obtained from: Juniper Networks, Inc.
MFC after: 3 days
94 lines
2.7 KiB
C
94 lines
2.7 KiB
C
/*-
|
|
* Copyright (c) 2014 Juniper Networks, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MKIMG_MKIMG_H_
|
|
#define _MKIMG_MKIMG_H_
|
|
|
|
#include <sys/queue.h>
|
|
|
|
struct part {
|
|
STAILQ_ENTRY(part) link;
|
|
char *alias; /* Partition type alias. */
|
|
char *contents; /* Contents/size specification. */
|
|
u_int kind; /* Content kind. */
|
|
#define PART_UNDEF 0
|
|
#define PART_KIND_FILE 1
|
|
#define PART_KIND_PIPE 2
|
|
#define PART_KIND_SIZE 3
|
|
u_int index; /* Partition index (0-based). */
|
|
uintptr_t type; /* Scheme-specific partition type. */
|
|
lba_t block; /* Block-offset of partition in image. */
|
|
lba_t size; /* Size in blocks of partition. */
|
|
char *label; /* Partition label. */
|
|
};
|
|
|
|
extern STAILQ_HEAD(partlisthead, part) partlist;
|
|
extern u_int nparts;
|
|
|
|
extern u_int unit_testing;
|
|
extern u_int verbose;
|
|
|
|
extern u_int ncyls;
|
|
extern u_int nheads;
|
|
extern u_int nsecs;
|
|
extern u_int secsz; /* Logical block size. */
|
|
extern u_int blksz; /* Physical block size. */
|
|
|
|
static inline lba_t
|
|
round_block(lba_t n)
|
|
{
|
|
lba_t b = blksz / secsz;
|
|
return ((n + b - 1) & ~(b - 1));
|
|
}
|
|
|
|
static inline lba_t
|
|
round_cylinder(lba_t n)
|
|
{
|
|
u_int cyl = nsecs * nheads;
|
|
u_int r = n % cyl;
|
|
return ((r == 0) ? n : n + cyl - r);
|
|
}
|
|
|
|
static inline lba_t
|
|
round_track(lba_t n)
|
|
{
|
|
u_int r = n % nsecs;
|
|
return ((r == 0) ? n : n + nsecs - r);
|
|
}
|
|
|
|
#if !defined(SPARSE_WRITE)
|
|
#define sparse_write write
|
|
#else
|
|
ssize_t sparse_write(int, const void *, size_t);
|
|
#endif
|
|
|
|
struct uuid;
|
|
void mkimg_uuid(struct uuid *);
|
|
|
|
#endif /* _MKIMG_MKIMG_H_ */
|