mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 10:37:35 +03:00
Rebase master to b121
This commit is contained in:
@@ -124,21 +124,21 @@ vdev_mirror_map_alloc(zio_t *zio)
|
||||
static int
|
||||
vdev_mirror_open(vdev_t *vd, uint64_t *asize, uint64_t *ashift)
|
||||
{
|
||||
vdev_t *cvd;
|
||||
uint64_t c;
|
||||
int numerrors = 0;
|
||||
int ret, lasterror = 0;
|
||||
int lasterror = 0;
|
||||
|
||||
if (vd->vdev_children == 0) {
|
||||
vd->vdev_stat.vs_aux = VDEV_AUX_BAD_LABEL;
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
for (c = 0; c < vd->vdev_children; c++) {
|
||||
cvd = vd->vdev_child[c];
|
||||
vdev_open_children(vd);
|
||||
|
||||
if ((ret = vdev_open(cvd)) != 0) {
|
||||
lasterror = ret;
|
||||
for (int c = 0; c < vd->vdev_children; c++) {
|
||||
vdev_t *cvd = vd->vdev_child[c];
|
||||
|
||||
if (cvd->vdev_open_error) {
|
||||
lasterror = cvd->vdev_open_error;
|
||||
numerrors++;
|
||||
continue;
|
||||
}
|
||||
@@ -158,9 +158,7 @@ vdev_mirror_open(vdev_t *vd, uint64_t *asize, uint64_t *ashift)
|
||||
static void
|
||||
vdev_mirror_close(vdev_t *vd)
|
||||
{
|
||||
uint64_t c;
|
||||
|
||||
for (c = 0; c < vd->vdev_children; c++)
|
||||
for (int c = 0; c < vd->vdev_children; c++)
|
||||
vdev_close(vd->vdev_child[c]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user