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

DDF: ddf_activate_spare: fix metadata update for SVDs 

Metadata updates for secondary RAID (RAID10) need to cover
all BVDs. Compare with code in write_init_super_ddf().

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
mwilck@arcor.de 2013-07-25 20:59:13 +02:00 committed by NeilBrown
parent 62ff3c40c1
commit 0c78849f2b
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
super-ddf.c
View File

@ -4730,6 +4730,7 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
struct metadata_update *mu; struct metadata_update *mu;
struct dl *dl; struct dl *dl;
int i; int i;
unsigned int j;
struct vcl *vcl; struct vcl *vcl;
struct vd_config *vc; struct vd_config *vc;
unsigned int n_bvd; unsigned int n_bvd;
@ -4902,26 +4903,48 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
* Create a metadata_update record to update the * Create a metadata_update record to update the
* phys_refnum and lba_offset values * phys_refnum and lba_offset values
*/ */
vc = find_vdcr(ddf, a->info.container_member, di->disk.raid_disk,
&n_bvd, &vcl);
if (vc == NULL)
return NULL;
mu = xmalloc(sizeof(*mu)); mu = xmalloc(sizeof(*mu));
if (posix_memalign(&mu->space, 512, sizeof(struct vcl)) != 0) { if (posix_memalign(&mu->space, 512, sizeof(struct vcl)) != 0) {
free(mu); free(mu);
mu = NULL; mu = NULL;
} }
mu->buf = xmalloc(ddf->conf_rec_len * 512);
mu->len = ddf->conf_rec_len * 512; mu->len = ddf->conf_rec_len * 512 * vcl->conf.sec_elmnt_count;
mu->buf = xmalloc(mu->len);
mu->space = NULL; mu->space = NULL;
mu->space_list = NULL; mu->space_list = NULL;
mu->next = *updates; mu->next = *updates;
vc = find_vdcr(ddf, a->info.container_member, di->disk.raid_disk, memcpy(mu->buf, &vcl->conf, ddf->conf_rec_len * 512);
&n_bvd, &vcl); for (j = 1; j < vcl->conf.sec_elmnt_count; j++)
memcpy(mu->buf, vc, ddf->conf_rec_len * 512); memcpy(mu->buf + j * ddf->conf_rec_len * 512,
vcl->other_bvds[j-1], ddf->conf_rec_len * 512);
vc = (struct vd_config*)mu->buf; vc = (struct vd_config*)mu->buf;
for (di = rv ; di ; di = di->next) { for (di = rv ; di ; di = di->next) {
vc->phys_refnum[di->disk.raid_disk] = unsigned int i_sec, i_prim;
ddf->phys->entries[dl->pdnum].refnum; i_sec = di->disk.raid_disk
LBA_OFFSET(ddf, vc)[di->disk.raid_disk] / be16_to_cpu(vcl->conf.prim_elmnt_count);
= cpu_to_be64(di->data_offset); i_prim = di->disk.raid_disk
% be16_to_cpu(vcl->conf.prim_elmnt_count);
vc = (struct vd_config *)(mu->buf
+ i_sec * ddf->conf_rec_len * 512);
for (dl = ddf->dlist; dl; dl = dl->next)
if (dl->major == di->disk.major
&& dl->minor == di->disk.minor)
break;
if (!dl) {
pr_err("%s: BUG: can't find disk %d (%d/%d)\n",
__func__, di->disk.raid_disk,
di->disk.major, di->disk.minor);
return NULL;
}
vc->phys_refnum[i_prim] = ddf->phys->entries[dl->pdnum].refnum;
LBA_OFFSET(ddf, vc)[i_prim] = cpu_to_be64(di->data_offset);
} }
*updates = mu; *updates = mu;
return rv; return rv;