};
};
struct disk_data disk;
+ void *mdupdate; /* hold metadata update */
struct vcl *vlist[0]; /* max_part in size */
- } *dlist;
+ } *dlist, *add_list;
};
#ifndef offsetof
// info->disk.raid_disk = find refnum in the table and use index;
// info->disk.state = ???;
+ info->container_member = ddf->currentconf->vcnum;
+
info->resync_start = 0;
if (!(ddf->virt->entries[info->container_member].state
& DDF_state_inconsistent) &&
dd->major = major(stb.st_rdev);
dd->minor = minor(stb.st_rdev);
dd->devname = devname;
- dd->next = ddf->dlist;
dd->fd = fd;
dd->spare = NULL;
pde = &ddf->phys->entries[n];
dd->pdnum = n;
- n++;
- ddf->phys->used_pdes = __cpu_to_be16(n);
+ if (st->update_tail) {
+ int len = (sizeof(struct phys_disk) +
+ sizeof(struct phys_disk_entry));
+ struct phys_disk *pd;
+
+ pd = malloc(len);
+ pd->magic = DDF_PHYS_RECORDS_MAGIC;
+ pd->used_pdes = __cpu_to_be16(n);
+ pde = &pd->entries[0];
+ dd->mdupdate = pd;
+ } else {
+ n++;
+ ddf->phys->used_pdes = __cpu_to_be16(n);
+ }
memcpy(pde->guid, dd->disk.guid, DDF_GUID_LEN);
pde->refnum = dd->disk.refnum;
memset(pde->pad, 0xff, 6);
dd->size = size >> 9;
- ddf->dlist = dd;
- ddf->updates_pending = 1;
+ if (st->update_tail) {
+ dd->next = ddf->add_list;
+ ddf->add_list = dd;
+ } else {
+ dd->next = ddf->dlist;
+ ddf->dlist = dd;
+ ddf->updates_pending = 1;
+ }
}
/*
struct ddf_super *ddf = st->sb;
int len;
+ if (!ddf->currentconf) {
+ int len = (sizeof(struct phys_disk) +
+ sizeof(struct phys_disk_entry));
+
+ /* adding a disk to the container. */
+ if (!ddf->add_list)
+ return 0;
+
+ append_metadata_update(st, ddf->add_list->mdupdate, len);
+ ddf->add_list->mdupdate = NULL;
+ return 0;
+ }
+
+ /* Newly created VD */
+
/* First the virtual disk. We have a slightly fake header */
len = sizeof(struct virtual_disk) + sizeof(struct virtual_entry);
vd = malloc(len);
}
#ifndef MDASSEMBLE
-static int validate_geometry_ddf_container(struct supertype *st,
- int level, int layout, int raiddisks,
- int chunk, unsigned long long size,
- char *dev, unsigned long long *freesize);
+static int
+validate_geometry_ddf_container(struct supertype *st,
+ int level, int layout, int raiddisks,
+ int chunk, unsigned long long size,
+ char *dev, unsigned long long *freesize,
+ int verbose);
static int validate_geometry_ddf_bvd(struct supertype *st,
int level, int layout, int raiddisks,
int chunk, unsigned long long size,
- char *dev, unsigned long long *freesize);
+ char *dev, unsigned long long *freesize,
+ int verbose);
static int validate_geometry_ddf(struct supertype *st,
- int level, int layout, int raiddisks,
- int chunk, unsigned long long size,
- char *dev, unsigned long long *freesize)
+ int level, int layout, int raiddisks,
+ int chunk, unsigned long long size,
+ char *dev, unsigned long long *freesize,
+ int verbose)
{
int fd;
struct mdinfo *sra;
if (level == LEVEL_CONTAINER) {
/* Must be a fresh device to add to a container */
return validate_geometry_ddf_container(st, level, layout,
- raiddisks,
- chunk, size, dev, freesize);
+ raiddisks, chunk,
+ size, dev, freesize,
+ verbose);
}
if (st->sb) {
* Should make a distinction one day.
*/
return validate_geometry_ddf_bvd(st, level, layout, raiddisks,
- chunk, size, dev, freesize);
+ chunk, size, dev, freesize,
+ verbose);
}
if (!dev) {
/* Initial sanity check. Exclude illegal levels. */
/* Somehow return the fact that we have enough */
}
- fprintf(stderr,
- Name ": Cannot create this array on device %s\n",
- dev);
+ if (verbose)
+ fprintf(stderr,
+ Name ": ddf: Cannot create this array "
+ "on device %s\n",
+ dev);
return 0;
}
if (errno != EBUSY || (fd = open(dev, O_RDONLY, 0)) < 0) {
- fprintf(stderr, Name ": Cannot open %s: %s\n",
- dev, strerror(errno));
+ if (verbose)
+ fprintf(stderr, Name ": ddf: Cannot open %s: %s\n",
+ dev, strerror(errno));
return 0;
}
/* Well, it is in use by someone, maybe a 'ddf' container. */
cfd = open_container(fd);
if (cfd < 0) {
close(fd);
- fprintf(stderr, Name ": Cannot use %s: It is busy\n",
- dev);
+ if (verbose)
+ fprintf(stderr, Name ": ddf: Cannot use %s: %s\n",
+ dev, strerror(EBUSY));
return 0;
}
sra = sysfs_read(cfd, 0, GET_VERSION);
close(cfd);
return validate_geometry_ddf_bvd(st, level, layout,
raiddisks, chunk, size,
- dev, freesize);
+ dev, freesize,
+ verbose);
}
close(cfd);
} else /* device may belong to a different container */
return 1;
}
-static int validate_geometry_ddf_container(struct supertype *st,
- int level, int layout, int raiddisks,
- int chunk, unsigned long long size,
- char *dev, unsigned long long *freesize)
+static int
+validate_geometry_ddf_container(struct supertype *st,
+ int level, int layout, int raiddisks,
+ int chunk, unsigned long long size,
+ char *dev, unsigned long long *freesize,
+ int verbose)
{
int fd;
unsigned long long ldsize;
fd = open(dev, O_RDONLY|O_EXCL, 0);
if (fd < 0) {
- fprintf(stderr, Name ": Cannot open %s: %s\n",
- dev, strerror(errno));
+ if (verbose)
+ fprintf(stderr, Name ": ddf: Cannot open %s: %s\n",
+ dev, strerror(errno));
return 0;
}
if (!get_dev_size(fd, dev, &ldsize)) {
static int validate_geometry_ddf_bvd(struct supertype *st,
int level, int layout, int raiddisks,
int chunk, unsigned long long size,
- char *dev, unsigned long long *freesize)
+ char *dev, unsigned long long *freesize,
+ int verbose)
{
struct stat stb;
struct ddf_super *ddf = st->sb;
free(e);
}
if (dcnt < raiddisks) {
- fprintf(stderr, Name ": Not enough devices with space "
- "for this array (%d < %d)\n",
- dcnt, raiddisks);
+ if (verbose)
+ fprintf(stderr,
+ Name ": ddf: Not enough devices with "
+ "space for this array (%d < %d)\n",
+ dcnt, raiddisks);
return 0;
}
return 1;
break;
}
if (!dl) {
- fprintf(stderr, Name ": %s is not in the same DDF set\n",
- dev);
+ if (verbose)
+ fprintf(stderr, Name ": ddf: %s is not in the "
+ "same DDF set\n",
+ dev);
return 0;
}
e = get_extents(ddf, dl);
dfd = dev_open(nm, keep_fd? O_RDWR : O_RDONLY);
if (dfd < 0)
return 2;
+ load_ddf_headers(dfd, super, NULL);
seq = load_ddf_local(dfd, super, NULL, keep_fd);
if (!keep_fd) close(dfd);
}
dev->disk.raid_disk = i;
dev->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE);
- dev->events = __le32_to_cpu(ddf->primary.seq);
- dev->data_offset = vc->lba_offset[i];
+ dev->events = __be32_to_cpu(ddf->primary.seq);
+ dev->data_offset = __be64_to_cpu(vc->lba_offset[i]);
dev->component_size = __be64_to_cpu(vc->conf.blocks);
if (d->devname)
strcpy(dev->name, d->devname);
*/
static int ddf_open_new(struct supertype *c, struct active_array *a, char *inst)
{
- fprintf(stderr, "ddf: open_new %s\n", inst);
+ dprintf("ddf: open_new %s\n", inst);
a->info.container_member = atoi(inst);
return 0;
}
* For DDF, we need to clear the DDF_state_inconsistent bit in the
* !global! virtual_disk.virtual_entry structure.
*/
-static void ddf_set_array_state(struct active_array *a, int consistent)
+static int ddf_set_array_state(struct active_array *a, int consistent)
{
struct ddf_super *ddf = a->container->sb;
int inst = a->info.container_member;
int old = ddf->virt->entries[inst].state;
+ if (consistent == 2) {
+ /* Should check if a recovery should be started FIXME */
+ consistent = 1;
+ if (a->resync_start != ~0ULL)
+ consistent = 0;
+ }
if (consistent)
ddf->virt->entries[inst].state &= ~DDF_state_inconsistent;
else
if (old != ddf->virt->entries[inst].init_state)
ddf->updates_pending = 1;
- printf("ddf mark %d %s %llu\n", inst, consistent?"clean":"dirty",
- a->resync_start);
+ dprintf("ddf mark %d %s %llu\n", inst, consistent?"clean":"dirty",
+ a->resync_start);
+ return consistent;
}
/*
int i, st, working;
if (vc == NULL) {
- fprintf(stderr, "ddf: cannot find instance %d!!\n", inst);
+ dprintf("ddf: cannot find instance %d!!\n", inst);
return;
}
if (pd < 0) {
ddf->updates_pending = 1;
}
- fprintf(stderr, "ddf: set_disk %d to %x\n", n, state);
+ dprintf("ddf: set_disk %d to %x\n", n, state);
/* Now we need to check the state of the array and update
* virtual_disk.entries[n].state.
return;
ddf->updates_pending = 0;
__write_init_super_ddf(st, 0);
- fprintf(stderr, "ddf: sync_metadata\n");
+ dprintf("ddf: sync_metadata\n");
}
static void ddf_process_update(struct supertype *st,
int mppe;
int ent;
-// printf("Process update %x\n", *magic);
+ dprintf("Process update %x\n", *magic);
switch (*magic) {
case DDF_PHYS_RECORDS_MAGIC:
ddf->phys->used_pdes = __cpu_to_be16(1 +
__be16_to_cpu(ddf->phys->used_pdes));
ddf->updates_pending = 1;
+ if (ddf->add_list) {
+ struct active_array *a;
+ struct dl *al = ddf->add_list;
+ ddf->add_list = al->next;
+
+ al->next = ddf->dlist;
+ ddf->dlist = al;
+
+ /* As a device has been added, we should check
+ * for any degraded devices that might make
+ * use of this spare */
+ for (a = st->arrays ; a; a=a->next)
+ a->check_degraded = 1;
+ }
break;
case DDF_VIRT_RECORDS_MAGIC:
break;
case DDF_VD_CONF_MAGIC:
-// printf("len %d %d\n", update->len, ddf->conf_rec_len);
+ dprintf("len %d %d\n", update->len, ddf->conf_rec_len);
mppe = __be16_to_cpu(ddf->anchor.max_primary_element_entries);
if (update->len != ddf->conf_rec_len * 512)
for (vcl = ddf->conflist; vcl ; vcl = vcl->next)
if (memcmp(vcl->conf.guid, vc->guid, DDF_GUID_LEN) == 0)
break;
-// printf("vcl = %p\n", vcl);
+ dprintf("vcl = %p\n", vcl);
if (vcl) {
/* An update, just copy the phys_refnum and lba_offset
* fields
for (dn=0; dn < ddf->mppe ; dn++)
if (vcl->conf.phys_refnum[dn] ==
dl->disk.refnum) {
-// printf("dev %d has %p at %d\n",
-// dl->pdnum, vcl, vn);
+ dprintf("dev %d has %p at %d\n",
+ dl->pdnum, vcl, vn);
dl->vlist[vn++] = vcl;
break;
}
working ++;
}
-// printf("ddf_activate: working=%d (%d) level=%d\n", working, a->info.array.raid_disks,
-// a->info.array.level);
+ dprintf("ddf_activate: working=%d (%d) level=%d\n", working, a->info.array.raid_disks,
+ a->info.array.level);
if (working == a->info.array.raid_disks)
return NULL; /* array not degraded */
switch (a->info.array.level) {
for (d = a->info.devs ; d ; d = d->next)
if (d->disk.raid_disk == i)
break;
- printf("found %d: %p %x\n", i, d, d?d->curr_state:0);
+ dprintf("found %d: %p %x\n", i, d, d?d->curr_state:0);
if (d && (d->state_fd >= 0))
continue;
for (d2 = a->info.devs ; d2 ; d2 = d2->next)
if (d2->disk.major == dl->major &&
d2->disk.minor == dl->minor) {
- printf("%x:%x already in array\n", dl->major, dl->minor);
+ dprintf("%x:%x already in array\n", dl->major, dl->minor);
break;
}
if (d2)
}
if ( ! (is_dedicated ||
(is_global && global_ok))) {
- printf("%x:%x not suitable: %d %d\n", dl->major, dl->minor,
+ dprintf("%x:%x not suitable: %d %d\n", dl->major, dl->minor,
is_dedicated, is_global);
continue;
}
* We need a->info.component_size sectors */
ex = get_extents(ddf, dl);
if (!ex) {
- printf("cannot get extents\n");
+ dprintf("cannot get extents\n");
continue;
}
j = 0; pos = 0;
free(ex);
if (esize < a->info.component_size) {
- printf("%x:%x has no room: %llu %llu\n", dl->major, dl->minor,
- esize, a->info.component_size);
+ dprintf("%x:%x has no room: %llu %llu\n", dl->major, dl->minor,
+ esize, a->info.component_size);
/* No room */
continue;
}
di->container_member = dl->pdnum;
di->next = rv;
rv = di;
- printf("%x:%x to be %d at %llu\n", dl->major, dl->minor,
- i, pos);
+ dprintf("%x:%x to be %d at %llu\n", dl->major, dl->minor,
+ i, pos);
break;
}
projects / thirdparty / mdadm.git / blobdiff