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

Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-09 10:42:25 -07:00
parent 79fdd61993 e91a439720
commit 2d4fa0b507
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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,