Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DDF: add_to_super_ddf: Use same amount of workspace as other disks 

If there are already disks in the container, reserve the same amount
of workspace as the first disk. Fill in the primary/secondary/
workspace LBA values.

Signed-off-by: Martin Wilck <mwilck@arcor.de>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
mwilck@arcor.de 2013-07-03 22:27:59 +02:00 committed by NeilBrown
parent 4a3ca8acc3
commit 4ee8cca90e
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
super-ddf.c
View File

@ -2586,6 +2586,13 @@ static int add_to_super_ddf(struct supertype *st,
return 1;
}
pde = &ddf->phys->entries[n];
get_dev_size(fd, NULL, &size);
if (size <= 32*1024*1024) {
pr_err("%s: device size must be at least 32MB\n",
__func__);
return 1;
}
size >>= 9;
if (posix_memalign((void**)&dd, 512,
sizeof(*dd) + sizeof(dd->vlist[0]) * ddf->max_part) != 0) {
@ -2645,13 +2652,31 @@ static int add_to_super_ddf(struct supertype *st,
pde->refnum = dd->disk.refnum;
pde->type = __cpu_to_be16(DDF_Forced_PD_GUID | DDF_Global_Spare);
pde->state = __cpu_to_be16(DDF_Online);
get_dev_size(fd, NULL, &size);
/* We are required to reserve 32Meg, and record the size in sectors */
pde->config_size = __cpu_to_be64( (size - 32*1024*1024) / 512);
dd->size = size;
/*
* If there is already a device in dlist, try to reserve the same
* amount of workspace. Otherwise, use 32MB.
* We checked disk size above already.
*/
#define __calc_lba(new, old, lba, mb) do { \
unsigned long long dif; \
if ((old) != NULL) \
dif = (old)->size - __be64_to_cpu((old)->lba); \
else \
dif = (new)->size; \
if ((new)->size > dif) \
(new)->lba = __cpu_to_be64((new)->size - dif); \
else \
(new)->lba = __cpu_to_be64((new)->size - (mb*1024*2)); \
} while (0)
__calc_lba(dd, ddf->dlist, workspace_lba, 32);
__calc_lba(dd, ddf->dlist, primary_lba, 16);
__calc_lba(dd, ddf->dlist, secondary_lba, 32);
pde->config_size = dd->workspace_lba;
sprintf(pde->path, "%17.17s","Information: nil") ;
memset(pde->pad, 0xff, 6);
dd->size = size >> 9;
if (st->update_tail) {
dd->next = ddf->add_list;
ddf->add_list = dd;