xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fdisk: use lba values in fdisk when writing partition not possibly rounded cylinders (because we might guessed the disk geometry wrong)

Browse source 
libdisk: make partition geometry detection work
This commit is contained in:
cinap_lenrek 2011-07-14 23:01:01 +02:00
parent 7dfdb696a6
commit 4ac8429d11
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/src/cmd/disk/prep/fdisk.c
View file

@ -405,7 +405,7 @@ mkpart(char *name, int primary, vlong lba, vlong size, Tentry *t)
p->changed = 0;
p->start = lba/sec2cyl;
p->end = (lba+size)/sec2cyl;
p->end = (lba+size+sec2cyl-1)/sec2cyl;
p->ctlstart = lba;
p->ctlend = lba+size;
p->lba = lba;
@ -1028,7 +1028,7 @@ wrextend(Edit *edit, int i, vlong xbase, vlong startlba, vlong *endlba)
p = (Dospart*)edit->part[i];
if(p->primary){
*endlba = (vlong)p->start*sec2cyl;
*endlba = (vlong)p->ctlstart;
goto Finish;
}
@ -1037,15 +1037,15 @@ wrextend(Edit *edit, int i, vlong xbase, vlong startlba, vlong *endlba)
tp = table.entry;
ep = tp+NTentry;
ni = wrextend(edit, i+1, xbase, p->end*sec2cyl, endlba);
ni = wrextend(edit, i+1, xbase, p->ctlend, endlba);
*tp = p->Tentry;
wrtentry(disk, tp, p->type, startlba, startlba+disk->s, p->end*sec2cyl);
wrtentry(disk, tp, p->type, startlba, startlba+disk->s, p->ctlend);
tp++;
if(p->end*sec2cyl != *endlba){
if(p->ctlend != *endlba){
memset(tp, 0, sizeof *tp);
wrtentry(disk, tp, TypeEXTENDED, xbase, p->end*sec2cyl, *endlba);
wrtentry(disk, tp, TypeEXTENDED, xbase, p->ctlend, *endlba);
tp++;
}
@ -1081,14 +1081,14 @@ wrpart(Edit *edit)
if(p->start == 0)
s = disk->s;
else
s = p->start*sec2cyl;
s = p->ctlstart;
if(p->primary) {
*tp = p->Tentry;
wrtentry(disk, tp, p->type, 0, s, p->end*sec2cyl);
wrtentry(disk, tp, p->type, 0, s, p->ctlend);
tp++;
i++;
} else {
ni = wrextend(edit, i, p->start*sec2cyl, p->start*sec2cyl, &endlba);
ni = wrextend(edit, i, p->ctlstart, p->ctlstart, &endlba);
memset(tp, 0, sizeof *tp);
if(endlba >= 1024*sec2cyl)
t = TypeEXTHUGE;

3
sys/src/libdisk/disk.c
View file

@ -63,9 +63,6 @@ partitiongeometry(Disk *disk)
uchar buf[512];
Table *t;
if(disk->c == 0 || disk->h == 0 || disk->s == 0)
return -1;
t = (Table*)(buf + Toffset);
/*