ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fdisk: move DOS geometry code from generic part to label specific 

get_partition_table_geometry() should be called from DOS code

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-07-23 13:57:58 +02:00
parent 6123d1dd13
commit 9a5e29e94b
4 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fdisks/fdisk.c
View File

@ -431,38 +431,6 @@ void warn_alignment(struct fdisk_context *cxt)
}
void
get_partition_table_geometry(struct fdisk_context *cxt, unsigned int *ph, unsigned int *ps) {
unsigned char *bufp = cxt->mbr;
struct partition *p;
int i, h, s, hh, ss;
int first = 1;
int bad = 0;
if (!(valid_part_table_flag(bufp)))
return;
hh = ss = 0;
for (i=0; i<4; i++) {
p = pt_offset(bufp, i);
if (p->sys_ind != 0) {
h = p->end_head + 1;
s = (p->end_sector & 077);
if (first) {
hh = h;
ss = s;
first = 0;
} else if (hh != h || ss != s)
bad = 1;
}
}
if (!first && !bad) {
*ph = hh;
*ps = ss;
}
}
/*
* Sets LBA of the first partition
*/
@ -1746,7 +1714,8 @@ static void print_partition_table_from_option(char *device, unsigned long sector
if (sector_size) /* passed -b option, override autodiscovery */
fdisk_context_force_sector_size(cxt, sector_size);
fdisk_context_set_user_geometry(cxt, user_cylinders,
if (user_cylinders || user_heads || user_sectors)
fdisk_context_set_user_geometry(cxt, user_cylinders,
user_heads, user_sectors);
gpt_warning(device);
@ -2044,8 +2013,9 @@ int main(int argc, char **argv)
if (sector_size) /* passed -b option, override autodiscovery */
fdisk_context_force_sector_size(cxt, sector_size);
fdisk_context_set_user_geometry(cxt, user_cylinders,
user_heads, user_sectors);
if (user_cylinders || user_heads || user_sectors)
fdisk_context_set_user_geometry(cxt, user_cylinders,
user_heads, user_sectors);
print_welcome();

2
fdisks/fdisk.h
View File

@ -193,8 +193,6 @@ extern unsigned int read_int_with_suffix(struct fdisk_context *cxt,
extern sector_t align_lba(struct fdisk_context *cxt, sector_t lba, int direction);
extern int get_partition_dflt(struct fdisk_context *cxt, int warn, int max, int dflt);
extern void update_sector_offset(struct fdisk_context *cxt);
extern void get_partition_table_geometry(struct fdisk_context *cxt,
unsigned int *ph, unsigned int *ps);
#define PLURAL 0
#define SINGULAR 1

38
fdisks/fdiskdoslabel.c
View File

@ -323,15 +323,53 @@ void dos_delete_partition(int i)
}
}
static void get_partition_table_geometry(struct fdisk_context *cxt,
unsigned int *ph, unsigned int *ps)
{
unsigned char *bufp = cxt->mbr;
struct partition *p;
int i, h, s, hh, ss;
int first = 1;
int bad = 0;
hh = ss = 0;
for (i=0; i<4; i++) {
p = pt_offset(bufp, i);
if (p->sys_ind != 0) {
h = p->end_head + 1;
s = (p->end_sector & 077);
if (first) {
hh = h;
ss = s;
first = 0;
} else if (hh != h || ss != s)
bad = 1;
}
}
if (!first && !bad) {
*ph = hh;
*ps = ss;
}
}
static int dos_probe_label(struct fdisk_context *cxt)
{
int i;
unsigned int h = 0, s = 0;
if (!valid_part_table_flag(cxt->mbr))
return 0;
dos_init(cxt);
get_partition_table_geometry(cxt, &h, &s);
if (h && s) {
cxt->geom.heads = h;
cxt->geom.sectors = s;
}
for (i = 0; i < 4; i++) {
struct pte *pe = &ptes[i];

42
fdisks/utils.c
View File

@ -114,6 +114,9 @@ int fdisk_context_force_sector_size(struct fdisk_context *cxt, sector_t s)
return -EINVAL;
cxt->phy_sector_size = cxt->sector_size = s;
cxt->min_io_size = cxt->io_size = s;
update_sector_offset(cxt);
return 0;
}
@ -146,17 +149,19 @@ int fdisk_context_set_user_geometry(struct fdisk_context *cxt,
if (sectors)
cxt->geom.sectors = sectors;
recount_geometry(cxt);
if (!cxt->geom.cylinders)
/* use the user defined cylinders only as fillback */
if (cylinders)
cxt->geom.cylinders = cylinders;
else
recount_geometry(cxt);
update_sector_offset(cxt);
return 0;
}
static int __discover_geometry(struct fdisk_context *cxt)
/*
* Generic (label independent) geometry
*/
static int __discover_system_geometry(struct fdisk_context *cxt)
{
sector_t nsects;
unsigned int h = 0, s = 0;
@ -165,26 +170,19 @@ static int __discover_geometry(struct fdisk_context *cxt)
if (!blkdev_get_sectors(cxt->dev_fd, &nsects))
cxt->total_sectors = (nsects / (cxt->sector_size >> 9));
get_partition_table_geometry(cxt, &h, &s);
if (h && s)
goto hs_ok;
/* what the kernel/bios thinks the geometry is */
blkdev_get_geometry(cxt->dev_fd, &h, &s);
if (h && s)
goto hs_ok;
if (!h && !s) {
/* unable to discover geometry, use default values */
s = 63;
h = 255;
}
/* unable to discover geometry, use default values */
s = 63;
h = 255;
hs_ok: /* obtained heads and sectors */
/* obtained heads and sectors */
cxt->geom.heads = h;
cxt->geom.sectors = s;
recount_geometry(cxt);
update_sector_offset(cxt);
DBG(GEOMETRY, dbgprint("geometry discovered for %s: C/H/S: %lld/%d/%lld",
cxt->dev_path, cxt->geom.cylinders,
cxt->geom.heads, cxt->geom.sectors));
@ -376,10 +374,14 @@ struct fdisk_context *fdisk_new_context_from_filename(const char *fname, int rea
goto fail;
__discover_topology(cxt);
__discover_geometry(cxt);
__discover_system_geometry(cxt);
/* detect labels and apply labes specific stuff (e.g geomery)
* to the context */
__probe_labels(cxt);
update_sector_offset(cxt);
DBG(CONTEXT, dbgprint("context initialized for %s [%s]",
fname, readonly ? "READ-ONLY" : "READ-WRITE"));
return cxt;