Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-09 10:44:43 -07:00
parent 259e071068 234f23a73a
commit 3d867879b1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/vdev.c
View File

@ -132,8 +132,8 @@ vdev_get_min_asize(vdev_t *vd)
void void
vdev_set_min_asize(vdev_t *vd) vdev_set_min_asize(vdev_t *vd)
{ {
vd->vdev_min_asize = vdev_get_min_asize(vd);
int c; int c;
vd->vdev_min_asize = vdev_get_min_asize(vd);
for (c = 0; c < vd->vdev_children; c++) for (c = 0; c < vd->vdev_children; c++)
vdev_set_min_asize(vd->vdev_child[c]); vdev_set_min_asize(vd->vdev_child[c]);

3
module/zfs/vdev_disk.c
View File

@ -531,8 +531,7 @@ vdev_disk_read_rootlabel(char *devpath, char *devid, nvlist_t **config)
/* read vdev label */ /* read vdev label */
offset = vdev_label_offset(size, i, 0); offset = vdev_label_offset(size, i, 0);
if (vdev_disk_physio(vd_lh, (caddr_t)label, if (vdev_disk_physio(vd_lh, (caddr_t)label,
VDEV_SKIP_SIZE + VDEV_BOOT_HEADER_SIZE + VDEV_SKIP_SIZE + VDEV_PHYS_SIZE, offset, READ) != 0)
VDEV_PHYS_SIZE, offset, READ) != 0)
continue; continue;
if (nvlist_unpack(label->vl_vdev_phys.vp_nvlist, if (nvlist_unpack(label->vl_vdev_phys.vp_nvlist,