d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: revert r342161 and r342151

Browse Source 
We are using asize property from pool label and we do not depend
on partition data to find last two pool labels and to validate LBA for disk IO.

This does allow us to re-enable support for partitionless disk setups.
This commit is contained in:
Toomas Soome 2020-10-22 20:02:02 +00:00
parent c7520caa4f
commit e416eecbb9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=366951
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
stand/libsa/zfs/zfs.c
View File

@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/time.h>
#include <sys/queue.h>
#include <disk.h>
#include <part.h>
#include <stddef.h>
#include <stdarg.h>
@ -1421,7 +1420,6 @@ zfs_attach_nvstore(void *vdev)
int
zfs_probe_dev(const char *devname, uint64_t *pool_guid)
{
struct disk_devdesc *dev;
struct ptable *table;
struct zfs_probe_args pa;
uint64_t mediasz;
@ -1432,22 +1430,10 @@ zfs_probe_dev(const char *devname, uint64_t *pool_guid)
pa.fd = open(devname, O_RDWR);
if (pa.fd == -1)
return (ENXIO);
/*
* We will not probe the whole disk, we can not boot from such
* disks and some systems will misreport the disk sizes and will
* hang while accessing the disk.
*/
if (archsw.arch_getdev((void **)&dev, devname, NULL) == 0) {
int partition = dev->d_partition;
int slice = dev->d_slice;
free(dev);
if (partition != D_PARTNONE && slice != D_SLICENONE) {
ret = zfs_probe(pa.fd, pool_guid);
if (ret == 0)
return (0);
}
}
/* Probe the whole disk */
ret = zfs_probe(pa.fd, pool_guid);
if (ret == 0)
return (0);
/* Probe each partition */
ret = ioctl(pa.fd, DIOCGMEDIASIZE, &mediasz);