From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Fri, 2 May 2014 17:31:09 +0000 (+0800)
Subject: mds: fix _rollback_repair_dir()
X-Git-Tag: v0.81~47^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e3501bd31a72f5ef68a8f1213ab2b2c7e92f853;p=ceph.git

mds: fix _rollback_repair_dir()

_rollback_repair_dir() may increase dirfrag's rfiles/rsubdirs twice.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 0cf46edd5ccb..9a82be3d8d9e 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -6738,10 +6738,8 @@ void _rollback_repair_dir(MutationRef& mut, CDir *dir, rename_rollback::drec &r,
 
   if (isdir) {
     pf->fragstat.nsubdirs += linkunlink;
-    pf->rstat.rsubdirs += linkunlink;
   } else {
     pf->fragstat.nfiles += linkunlink;
-    pf->rstat.rfiles += linkunlink;
   }    
   if (r.ino) {
     pf->rstat.rbytes += linkunlink * rstat.rbytes;