mds: don't fuss with versions when taking frag/rstat from frag; it's never stale...

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index a82d717c8c134ed9216d8e1b6e0970be9056e1db..b4bf5fb20ebddc743ddadb0ce454218ffddb95b3 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1875,9 +1875,7 @@ void MDCache::predirty_journal_parents(Mutation *mut, EMetaBlob *blob,
          mds->logclient.log(LOG_ERROR, ss);
          
          // trust the dirfrag for now
-         version_t v = pi->dirstat.version;
          pi->dirstat = pf->fragstat;
-         pi->dirstat.version = v;
 
          assert(!"unmatched fragstat size" == g_conf.mds_verify_scatter);
        }
@@ -1925,9 +1923,7 @@ void MDCache::predirty_journal_parents(Mutation *mut, EMetaBlob *blob,
          mds->logclient.log(LOG_ERROR, ss);
          
          // trust the dirfrag for now
-         version_t v = pi->rstat.version;
          pi->rstat = pf->rstat;
-         pi->rstat.version = v;
 
          assert(!"unmatched rstat rbytes" == g_conf.mds_verify_scatter);
        }