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

imsm: FIX: Component size alignment check 

Put currently existing code for alignment correction in to function
imsm_component_size_aligment_check() and use it for align component size
to chunk size during volume size expansion operation.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Adam Kwolek 2012-04-13 16:52:06 +02:00 committed by NeilBrown
parent b130333f39
commit c41e00b2e6
1 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
super-intel.c
View File

@ -2454,6 +2454,32 @@ int imsm_reshape_blocks_arrays_changes(struct intel_super *super)
}
return rv;
}
static unsigned long long imsm_component_size_aligment_check(int level,
int chunk_size,
unsigned long long component_size)
{
unsigned int component_size_alligment;
/* check component size aligment
*/
component_size_alligment = component_size % (chunk_size/512);
dprintf("imsm_component_size_aligment_check(Level: %i, "
"chunk_size = %i, component_size = %llu), "
"component_size_alligment = %u\n",
level, chunk_size, component_size,
component_size_alligment);
if (component_size_alligment && (level != 1) && (level != UnSet)) {
dprintf("imsm: reported component size alligned from %llu ",
component_size);
component_size -= component_size_alligment;
dprintf("to %llu (%i).\n",
component_size, component_size_alligment);
}
return component_size;
}
static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, char *dmap)
{
@ -2465,7 +2491,6 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
struct imsm_map *map_to_analyse = map;
struct dl *dl;
char *devname;
unsigned int component_size_alligment;
int map_disks = info->array.raid_disks;
memset(info, 0, sizeof(*info));
@ -2548,19 +2573,10 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
info->data_offset = pba_of_lba0(map_to_analyse);
info->component_size = blocks_per_member(map_to_analyse);
/* check component size aligment
*/
component_size_alligment =
info->component_size % (info->array.chunk_size/512);
if (component_size_alligment &&
(info->array.level != 1) && (info->array.level != UnSet)) {
dprintf("imsm: reported component size alligned from %llu ",
info->component_size);
info->component_size -= component_size_alligment;
dprintf("to %llu (%i).\n",
info->component_size, component_size_alligment);
}
info->component_size = imsm_component_size_aligment_check(
info->array.level,
info->array.chunk_size,
info->component_size);
memset(info->uuid, 0, sizeof(info->uuid));
info->recovery_start = MaxSector;
@ -9949,9 +9965,18 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
super = st->sb;
dev = get_imsm_dev(super, super->current_vol);
data_disks = imsm_num_data_members(dev , MAP_0);
/* compute current size in K per disk member
/* compute current size per disk member
*/
current_size = info.custom_array_size / 2 / data_disks;
current_size = info.custom_array_size / data_disks;
if (geo->size > 0) {
/* align component size
*/
geo->size = imsm_component_size_aligment_check(
get_imsm_raid_level(dev->vol.map),
chunk * 1024,
geo->size * 2);
}
if ((current_size != geo->size) && (geo->size >= 0)) {
if (change != -1) {
@ -9984,10 +10009,13 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
}
geo->size = freesize + current_size;
/* round to chunk size */
geo->size &= ~(chunk-1);
} else
geo->size *= 2;
/* align component size
*/
geo->size = imsm_component_size_aligment_check(
get_imsm_raid_level(dev->vol.map),
chunk * 1024,
geo->size);
}
if ((direction == ROLLBACK_METADATA_CHANGES)) {
/* accept size for rollback only