mds: fix rfile/rsubdirs accounting vs linkunlink

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index a97c1ba99a332476d7d66ca3ac3ec02c0f876649..2c699d5fb173f392fdf59bad8c360cb2612312a1 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -145,7 +145,7 @@ CDir::CDir(CInode *in, frag_t fg, MDCache *mdcache, bool auth) :
   frag = fg;
   this->cache = mdcache;
 
-  first = 1;
+  first = 2;
   
   num_head_items = num_head_null = 0;
   num_snap_items = num_snap_null = 0;

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index ef53596ca5081e09f62ccf8c2c6be086d74a900a..e55fe97ca95fb3c05a75c76d83a68f8f9163dfe3 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1423,10 +1423,10 @@ void MDCache::predirty_journal_parents(Mutation *mut, EMetaBlob *blob,
        dout(10) << "predirty_journal_parents updating size on " << *parent << dendl;
        if (in->is_dir()) {
          pf->fragstat.nsubdirs += linkunlink;
-         pf->rstat.rsubdirs += linkunlink;
+         //pf->rstat.rsubdirs += linkunlink;
        } else {
          pf->fragstat.nfiles += linkunlink;
-         pf->rstat.rfiles += linkunlink;
+         //pf->rstat.rfiles += linkunlink;
        }
       }
     }