From: Sage Weil <sage@newdream.net>
Date: Fri, 24 Oct 2008 23:47:19 +0000 (-0700)
Subject: mds: fix rfile/rsubdirs accounting vs linkunlink
X-Git-Tag: v0.5~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c8ce87c793ee5d355bcc8542112dcb99d871714;p=ceph.git

mds: fix rfile/rsubdirs accounting vs linkunlink
---

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index a97c1ba99a33..2c699d5fb173 100644
--- 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 ef53596ca508..e55fe97ca95f 100644
--- 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;
 	}
       }
     }