superfluous CDir::PIN_EXPORTING

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1931 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/sage/mds/mds/CDir.h b/branches/sage/mds/mds/CDir.h
index 6a29024ee7d962f14a8cf4cb0f44615a5d6b1370..99bad3801e1305b64ceb811ef932ab1a0259cc41 100644 (file)
--- a/branches/sage/mds/mds/CDir.h
+++ b/branches/sage/mds/mds/CDir.h
@@ -57,7 +57,6 @@ class CDir : public MDSCacheObject {
   static const int PIN_FROZEN =       4;
   static const int PIN_SUBTREE =      5;
   static const int PIN_IMPORTING =    7;
-  static const int PIN_EXPORTING =    8;
   static const int PIN_IMPORTBOUND =  9;
   static const int PIN_EXPORTBOUND = 10;
   static const int PIN_STICKY =      11;
@@ -69,7 +68,6 @@ class CDir : public MDSCacheObject {
     case PIN_CHILD: return "child";
     case PIN_FROZEN: return "frozen";
     case PIN_SUBTREE: return "subtree";
-    case PIN_EXPORTING: return "exporting";
     case PIN_IMPORTING: return "importing";
     case PIN_IMPORTBOUND: return "importbound";
     case PIN_EXPORTBOUND: return "exportbound";

diff --git a/branches/sage/mds/mds/Migrator.cc b/branches/sage/mds/mds/Migrator.cc
index 33b91ab33a9e24c4ec95e82e675b0d301646283a..ac02938ddbe886962ce096d59bc557c451f1923b 100644 (file)
--- a/branches/sage/mds/mds/Migrator.cc
+++ b/branches/sage/mds/mds/Migrator.cc
@@ -178,7 +178,6 @@ void Migrator::handle_mds_failure_or_stop(int who)
        dir->auth_unpin();
        export_state.erase(dir); // clean up
        dir->state_clear(CDir::STATE_EXPORTING);
-       dir->put(CDir::PIN_EXPORTING);
        if (export_peer[dir] != who) // tell them.
          mds->send_message_mds(new MExportDirCancel(dir->dirfrag()), export_peer[dir], MDS_PORT_MIGRATOR);
        break;
@@ -188,7 +187,6 @@ void Migrator::handle_mds_failure_or_stop(int who)
        dir->unfreeze_tree();  // cancel the freeze
        export_state.erase(dir); // clean up
        dir->state_clear(CDir::STATE_EXPORTING);
-       dir->put(CDir::PIN_EXPORTING);
        if (export_peer[dir] != who) // tell them.
          mds->send_message_mds(new MExportDirCancel(dir->dirfrag()), export_peer[dir], MDS_PORT_MIGRATOR);
        break;
@@ -219,7 +217,6 @@ void Migrator::handle_mds_failure_or_stop(int who)
        cache->try_subtree_merge(dir);
        export_state.erase(dir); // clean up
        dir->state_clear(CDir::STATE_EXPORTING);
-       dir->put(CDir::PIN_EXPORTING);
        break;
        
       case EXPORT_EXPORTING:
@@ -227,7 +224,6 @@ void Migrator::handle_mds_failure_or_stop(int who)
        export_reverse(dir);
        export_state.erase(dir); // clean up
        dir->state_clear(CDir::STATE_EXPORTING);
-       dir->put(CDir::PIN_EXPORTING);
        break;
 
       case EXPORT_LOGGINGFINISH:
@@ -575,7 +571,6 @@ void Migrator::export_dir(CDir *dir, int dest)
   export_peer[dir] = dest;
 
   dir->state_set(CDir::STATE_EXPORTING);
-  dir->get(CDir::PIN_EXPORTING);
 
   // send ExportDirDiscover (ask target)
   mds->send_message_mds(new MExportDirDiscover(dir), dest, MDS_PORT_MIGRATOR);
@@ -1289,7 +1284,6 @@ void Migrator::export_finish(CDir *dir)
 
   // remove from exporting list, clean up state
   dir->state_clear(CDir::STATE_EXPORTING);
-  dir->put(CDir::PIN_EXPORTING);
   export_state.erase(dir);
   export_peer.erase(dir);
   export_notify_ack_waiting.erase(dir);