diff options
| author | Joshua M. Clulow <jmc@joyent.com> | 2020-04-02 00:16:22 -0700 |
|---|---|---|
| committer | Joshua M. Clulow <josh@sysmgr.org> | 2020-04-02 00:16:56 -0700 |
| commit | 30c304d9746f4a048a7de56d31333b0fa8e43dee (patch) | |
| tree | ca4f81799f06cebd4c6e06629c886b70d695a8c9 /usr/src/uts/intel/zfs | |
| parent | 476d5ff73c235a63ab06a9852e510910a3ce1793 (diff) | |
| download | illumos-joyent-30c304d9746f4a048a7de56d31333b0fa8e43dee.tar.gz | |
7119 boot should handle change in physical path to ZFS root devices
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/intel/zfs')
| -rw-r--r-- | usr/src/uts/intel/zfs/spa_boot.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr/src/uts/intel/zfs/spa_boot.c b/usr/src/uts/intel/zfs/spa_boot.c index adbcffaef0..abcaac7ce9 100644 --- a/usr/src/uts/intel/zfs/spa_boot.c +++ b/usr/src/uts/intel/zfs/spa_boot.c @@ -26,6 +26,7 @@ /* * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright 2020 Joshua M. Clulow <josh@sysmgr.org> */ #include <sys/zio.h> @@ -36,19 +37,25 @@ extern int zfs_deadman_enabled; char * -spa_get_bootprop(char *propname) +spa_get_bootprop(const char *propname) { char *value; if (ddi_prop_lookup_string(DDI_DEV_T_ANY, ddi_root_node(), - DDI_PROP_DONTPASS, propname, &value) != DDI_SUCCESS) + DDI_PROP_DONTPASS, (char *)propname, &value) != DDI_SUCCESS) { return (NULL); + } + return (value); } void spa_free_bootprop(char *value) { + if (value == NULL) { + return; + } + ddi_prop_free(value); } |