diff options
| author | Karel Zak | 2013-09-18 14:50:54 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-18 14:50:54 +0200 |
| commit | 80063996be1593c0a37a7dd55d1a5baf1345588d (patch) | |
| tree | 29d53661d1cfa5bbe74e4bdea8e082ac387532d7 /libfdisk/src/dos.c | |
| parent | libfdisk: fix sectorbuffer usage in dos driver (diff) | |
| download | kernel-qcow2-util-linux-80063996be1593c0a37a7dd55d1a5baf1345588d.tar.gz kernel-qcow2-util-linux-80063996be1593c0a37a7dd55d1a5baf1345588d.tar.xz kernel-qcow2-util-linux-80063996be1593c0a37a7dd55d1a5baf1345588d.zip | |
libfdisk: fix cylinders and sector buffer usage
- sector buffer has to be correctly deallocated
- round to cylinders when use cylinder units in dos driver
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/dos.c')
| -rw-r--r-- | libfdisk/src/dos.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c index d83da432e..d9b1e745b 100644 --- a/libfdisk/src/dos.c +++ b/libfdisk/src/dos.c @@ -82,7 +82,7 @@ static struct fdisk_parttype dos_parttypes[] = { (fdisk_is_disklabel(_x, DOS) && \ fdisk_dos_is_compatible(fdisk_context_get_label(_x, NULL))) -#define cround(c, n) fdisk_scround(c, n) +#define cround(c, n) fdisk_cround(c, n) static inline struct fdisk_dos_label *self_label(struct fdisk_context *cxt) @@ -722,6 +722,10 @@ static void set_partition(struct fdisk_context *cxt, struct dos_partition *p; sector_t offset; + DBG(LABEL, dbgprint("DOS: setting partition %d%s, start=%zu, stop=%zu, sysid=%02x", + i, doext ? " [extended]" : "", + (size_t) start, (size_t) stop, sysid)); + if (doext) { struct fdisk_dos_label *l = self_label(cxt); p = pe->ex_entry; @@ -830,9 +834,10 @@ static int add_partition(struct fdisk_context *cxt, int n, struct fdisk_parttype + dos_partition_get_size(q) - 1; } if (fdisk_context_use_cylinders(cxt)) - for (i = 0; i < cxt->label->nparts_max; i++) + for (i = 0; i < cxt->label->nparts_max; i++) { first[i] = (cround(cxt, first[i]) - 1) * fdisk_context_get_units_per_sector(cxt); + } /* * Ask for first sector @@ -950,6 +955,11 @@ static int add_partition(struct fdisk_context *cxt, int n, struct fdisk_parttype stop = fdisk_ask_number_get_result(ask); + if (fdisk_context_use_cylinders(cxt)) { + stop = stop * fdisk_context_get_units_per_sector(cxt) - 1; + if (stop >limit) + stop = limit; + } if (fdisk_ask_number_is_relative(ask) && alignment_required(cxt)) { /* the last sector has not been exactly requested (but |