diff options
| author | Toomas Soome <tsoome@me.com> | 2018-03-13 09:45:13 +0200 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-05-14 08:47:35 -0400 |
| commit | 4e5127e8d53552c26604da7ec1d20e29b8196086 (patch) | |
| tree | 3062be4740a54f51dd2f1f6e29c438cc15db0833 /usr/src | |
| parent | e86c665f2e10cf29ac3b5f93b53c60bef762a690 (diff) | |
| download | illumos-joyent-4e5127e8d53552c26604da7ec1d20e29b8196086.tar.gz | |
9273 loader.efi: We can't use d_opendata for blkio storage.
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/sys/boot/efi/libefi/efipart.c | 1 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/efi/loader/main.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/usr/src/boot/sys/boot/efi/libefi/efipart.c b/usr/src/boot/sys/boot/efi/libefi/efipart.c index 1cad45b11c..86545cbab2 100644 --- a/usr/src/boot/sys/boot/efi/libefi/efipart.c +++ b/usr/src/boot/sys/boot/efi/libefi/efipart.c @@ -747,7 +747,6 @@ efipart_print_common(struct devsw *dev, pdinfo_list_t *pdlist, int verbose) pd_dev.d_unit = pd->pd_unit; pd_dev.d_slice = -1; pd_dev.d_partition = -1; - pd_dev.d_opendata = blkio; ret = disk_open(&pd_dev, blkio->Media->BlockSize * (blkio->Media->LastBlock + 1), blkio->Media->BlockSize); diff --git a/usr/src/boot/sys/boot/efi/loader/main.c b/usr/src/boot/sys/boot/efi/loader/main.c index 1113ac6f4a..1e2939e507 100644 --- a/usr/src/boot/sys/boot/efi/loader/main.c +++ b/usr/src/boot/sys/boot/efi/loader/main.c @@ -163,7 +163,6 @@ set_devdesc_currdev(struct devsw *dev, int unit) currdev.d_dev = dev; currdev.d_type = currdev.d_dev->dv_type; currdev.d_unit = unit; - currdev.d_opendata = NULL; devname = efi_fmtdev(&currdev); env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, @@ -190,7 +189,6 @@ find_currdev(EFI_LOADED_IMAGE *img) currdev.d_dev = &zfs_dev; currdev.d_unit = 0; currdev.d_type = currdev.d_dev->dv_type; - currdev.d_opendata = NULL; currdev.pool_guid = pool_guid; currdev.root_guid = 0; devname = efi_fmtdev(&currdev); @@ -210,7 +208,6 @@ find_currdev(EFI_LOADED_IMAGE *img) currdev.d_dev = &efipart_hddev; currdev.d_type = currdev.d_dev->dv_type; currdev.d_unit = dp->pd_unit; - currdev.d_opendata = NULL; currdev.d_slice = -1; currdev.d_partition = -1; |