Merge pull request #10958: jewel: client: fix shutdown with open inodes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Oct 10, 2016 · d47c249 · d47c249
2 parents 78f5f2b + cf211d7
commit d47c249
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -5651,9 +5651,10 @@ void Client::unmount()
 
   while (!ll_unclosed_fh_set.empty()) {
     set<Fh*>::iterator it = ll_unclosed_fh_set.begin();
-    ll_unclosed_fh_set.erase(*it);
-    ldout(cct, 0) << " destroyed lost open file " << *it << " on " << *((*it)->inode) << dendl;
-    _release_fh(*it);
+    Fh *fh = *it;
+    ll_unclosed_fh_set.erase(fh);
+    ldout(cct, 0) << " destroyed lost open file " << fh << " on " << *(fh->inode) << dendl;
+    _release_fh(fh);
   }
 
   while (!opened_dirs.empty()) {