diff options
| author | Warner Losh <imp@FreeBSD.org> | 2018-03-12 21:39:59 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2018-03-12 21:39:59 +0000 |
| commit | ad00892f4c729f7c07ed8ecb4e6f03dd8b055e48 (patch) | |
| tree | d45e34b3f7afcdfc5b2becac963bbfd6f8d99517 /stand/userboot | |
| parent | de04d704a98a7d2e9e57ebd83d2dd7a19fc11dab (diff) | |
Notes
Diffstat (limited to 'stand/userboot')
| -rw-r--r-- | stand/userboot/userboot/devicename.c | 3 | ||||
| -rw-r--r-- | stand/userboot/userboot/main.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/stand/userboot/userboot/devicename.c b/stand/userboot/userboot/devicename.c index c33614ee9335..06ec39481410 100644 --- a/stand/userboot/userboot/devicename.c +++ b/stand/userboot/userboot/devicename.c @@ -159,7 +159,6 @@ userboot_parsedev(struct disk_devdesc **dev, const char *devspec, const char **p goto fail; } idev->dd.d_dev = dv; - idev->dd.d_type = dv->dv_type; if (dev == NULL) { free(idev); } else { @@ -179,7 +178,7 @@ userboot_fmtdev(void *vdev) struct disk_devdesc *dev = (struct disk_devdesc *)vdev; static char buf[128]; /* XXX device length constant? */ - switch(dev->dd.d_type) { + switch(dev->dd.d_dev->dv_type) { case DEVT_NONE: strcpy(buf, "(no device)"); break; diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index 8243b4c71775..3ab4ca635250 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -166,7 +166,6 @@ extract_currdev(void) /* Leave the pool/root guid's unassigned */ bzero(&zdev, sizeof(zdev)); zdev.dd.d_dev = &zfs_dev; - zdev.dd.d_type = zdev.dd.d_dev->dv_type; dev = *(struct disk_devdesc *)&zdev; init_zfs_bootenv(zfs_fmtdev(&dev)); @@ -175,7 +174,6 @@ extract_currdev(void) if (userboot_disk_maxunit > 0) { dev.dd.d_dev = &userboot_disk; - dev.dd.d_type = dev.dd.d_dev->dv_type; dev.dd.d_unit = 0; dev.d_slice = 0; dev.d_partition = 0; @@ -189,7 +187,6 @@ extract_currdev(void) } } else { dev.dd.d_dev = &host_dev; - dev.dd.d_type = dev.dd.d_dev->dv_type; dev.dd.d_unit = 0; } |