From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 17 Apr 2018 03:13:37 +0000 (-0700)
Subject: mds: unset deleted vars in shutdown_pass
X-Git-Tag: v12.2.8~50^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1abe417a05c743d5e01628dd24848ce073f1deae;p=ceph.git

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 887c1062779..66420a478ba 100644
--- 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;