From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 7 Feb 2017 04:36:11 +0000 (+0800)
Subject: mds: kill export finish waiters
X-Git-Tag: v12.0.1~266^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84a661b9f2e59d70fba24121ab0c4a97abb5abcb;p=ceph.git

mds: kill export finish waiters

this code is unused

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 98279d0f2f5..8af8344c21a 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -345,9 +345,6 @@ void Migrator::export_try_cancel(CDir *dir, bool notify_peer)
 
   // finish clean-up?
   if (it->second.state == EXPORT_CANCELLED) {
-    // wake up any waiters
-    mds->queue_waiters(it->second.waiting_for_finish);
-
     MutationRef mut = it->second.mut;
 
     export_state.erase(it);
@@ -944,7 +941,6 @@ void Migrator::export_frozen(CDir *dir, uint64_t tid)
     // .. unwind ..
     dir->unfreeze_tree();
     dir->state_clear(CDir::STATE_EXPORTING);
-    mds->queue_waiters(it->second.waiting_for_finish);
 
     mds->send_message_mds(new MExportDirCancel(dir->dirfrag(), it->second.tid), it->second.peer);
 
@@ -1860,9 +1856,6 @@ void Migrator::export_finish(CDir *dir)
   // discard delayed expires
   cache->discard_delayed_expire(dir);
 
-  // queue finishers
-  mds->queue_waiters(it->second.waiting_for_finish);
-
   MutationRef mut = it->second.mut;
   // remove from exporting list, clean up state
   export_state.erase(it);
diff --git a/src/mds/Migrator.h b/src/mds/Migrator.h
index 75561442183..3c6cc602b87 100644
--- a/src/mds/Migrator.h
+++ b/src/mds/Migrator.h
@@ -89,7 +89,6 @@ protected:
     set<mds_rank_t> warning_ack_waiting;
     set<mds_rank_t> notify_ack_waiting;
     map<inodeno_t,map<client_t,Capability::Import> > peer_imported;
-    list<MDSInternalContextBase*> waiting_for_finish;
     MutationRef mut;
     // for freeze tree deadlock detection
     utime_t last_cum_auth_pins_change;
@@ -263,11 +262,6 @@ public:
 			 map<inodeno_t,map<client_t,Capability::Import> >& peer_imported,
 			 list<MDSInternalContextBase*>& finished, int *num_dentries);
 
-  void add_export_finish_waiter(CDir *dir, MDSInternalContextBase *c) {
-    map<CDir*, export_state_t>::iterator it = export_state.find(dir);
-    assert(it != export_state.end());
-    it->second.waiting_for_finish.push_back(c);
-  }
   void clear_export_proxy_pins(CDir *dir);
 
   void export_caps(CInode *in);