diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-09-19 15:46:26 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-09-19 15:46:26 +0000 |
| commit | 69083bd8df89bc158006965401ee59015a91638a (patch) | |
| tree | 68462086987dca64bbfb02510665bca85fe9c3c3 | |
| parent | 242ed79770c48697d49832e34db641d8e0d1464e (diff) | |
| download | illumos-joyent-69083bd8df89bc158006965401ee59015a91638a.tar.gz | |
9455 Expose drive speed and temperature on disk topo node [fix mismerge]
| -rw-r--r-- | usr/src/lib/fm/topo/modules/common/disk/disk_common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/usr/src/lib/fm/topo/modules/common/disk/disk_common.c b/usr/src/lib/fm/topo/modules/common/disk/disk_common.c index 340275d63f..3eebb3ee20 100644 --- a/usr/src/lib/fm/topo/modules/common/disk/disk_common.c +++ b/usr/src/lib/fm/topo/modules/common/disk/disk_common.c @@ -550,7 +550,6 @@ disk_tnode_create(topo_mod_t *mod, tnode_t *parent, return (-1); } - if (dnode != NULL && dnode->ddn_devid != NULL && if (dnode->ddn_devid != NULL && disk_add_temp_sensor(mod, dtn, dnode->ddn_devid) != 0) { topo_mod_dprintf(mod, "disk_tnode_create: failed to create " |