mds: remove traces of CDir::committed_version_equivalent

Don't think it's coming back

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index caf7669bdace92a45c4c377893c9deb221d70b5f..67bfff54a42b615b8b8514dde7cb1ce518da0dec 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -60,7 +60,6 @@ ostream& operator<<(ostream& out, CDir& dir)
     out << " v=" << dir.get_version();
     out << " cv=" << dir.get_committing_version();
     out << "/" << dir.get_committed_version();
-    //out << "/" << dir.get_committed_version_equivalent();
   } else {
     pair<int,int> a = dir.authority();
     out << " rep@" << a.first;
@@ -158,7 +157,6 @@ CDir::CDir(CInode *in, frag_t fg, MDCache *mdcache, bool auth) :
   projected_version = 0;
 
   committing_version = 0;
-  //committed_version_equivalent = 
   committed_version = 0;
 
   // dir_auth
@@ -1576,7 +1574,6 @@ void CDir::encode_export(bufferlist& bl)
   ::encode(fnode, bl);
   ::encode(dirty_old_rstat, bl);
   ::encode(committed_version, bl);
-  //::encode(committed_version_equivalent, bl);
 
   ::encode(state, bl);
   ::encode(dir_rep, bl);
@@ -1606,7 +1603,6 @@ void CDir::decode_import(bufferlist::iterator& blp)
   ::decode(dirty_old_rstat, blp);
   projected_version = fnode.version;
   ::decode(committed_version, blp);
-  //::decode(committed_version_equivalent, blp);
   committing_version = committed_version;
 
   unsigned s;

diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index 078dc4490bda2e9fcf06d205a0f40fa6def6850b..18be1c246583d3e9c0e96ad32dfdc1945ad62660 100644 (file)
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -211,7 +211,6 @@ protected:
   // state
   version_t committing_version;
   version_t committed_version;
-  //version_t committed_version_equivalent;  // in case of, e.g., temporary file
 
 
   // lock nesting, freeze
@@ -434,7 +433,6 @@ private:
   // -- dirtyness --
   version_t get_committing_version() { return committing_version; }
   version_t get_committed_version() { return committed_version; }
-  //version_t get_committed_version_equivalent() { return committed_version_equivalent; }
   void set_committed_version(version_t v) { committed_version = v; }
 
   void mark_complete() { state_set(STATE_COMPLETE); }