mds: unset deleted vars in shutdown_pass

So future passes do not try to delete again.

Fixes: http://tracker.ceph.com/issues/23766
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 3292d43192ffeb7fbf385e803c7e6e0c3c3891d9)

Conflicts:
	src/mds/MDCache.cc

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 887c1062779e8562bfa923e86229cb26da568723..66420a478baab22b1cd50ef6c9e4070696e7c7b6 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -7707,9 +7707,11 @@ bool MDCache::shutdown_pass()
   }
   assert(subtrees.empty());
 
-  if (myin)
+  if (myin) {
     remove_inode(myin);
-  
+    assert(!myin);
+  }
+
   // done!
   dout(2) << "shutdown done." << dendl;
   return true;