commit baeaf8f62bd45547ff7826bed6fbff9f25fa29f5
author Abdulla Kamar <abdulla@google.com> Wed Jan 30 21:28:06 2019 +1100
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Jan 30 20:16:56 2019 +0000
tree 20db9e64aadcf5eb81661994d5ad05f257b2f0f0
parent 3aea85c1b42cbde921150c9b48fdd453f8977721

[devmgr] Remove Devnode from devfs on desctruct

This allows devfs to be initialized in tests, and then shutdown without
aborting on the intrusive list destructor.

ZX-3286

Test: Ran Fuchsia and /system/test/ddk tests.
Change-Id: If4160854844ef14941d66c2e06675f0fc9fd9a8a

system/core/devmgr/devmgr/devfs.cpp

diff --git a/system/core/devmgr/devmgr/devfs.cpp b/system/core/devmgr/devmgr/devfs.cpp
index 6d79282..d5325dc 100644
--- a/system/core/devmgr/devmgr/devfs.cpp
+++ b/system/core/devmgr/devmgr/devfs.cpp
@@ -107,6 +107,7 @@
 // BUG(ZX-2868): We currently never free these after allocating them
 struct Devnode {
     explicit Devnode(fbl::String name);
+    ~Devnode();
 
     Devnode(const Devnode&) = delete;
     Devnode& operator=(const Devnode&) = delete;
@@ -549,8 +550,11 @@
     : name(std::move(name)) {
 }
 
-DcIostate::DcIostate(Devnode* dn) : devnode_(dn) {
+Devnode::~Devnode() {
+    devfs_remove(this);
+}
 
+DcIostate::DcIostate(Devnode* dn) : devnode_(dn) {
     devnode_->iostate.push_back(this);
 }