From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Thu, 19 Sep 2013 05:42:41 +0000 (+0800)
Subject: mds: fix MDCache::merge_dir()
X-Git-Tag: v0.72-rc1~39^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=473635ab03bdeb9e591a15ff9eb9fcae08ec272f;p=ceph.git

mds: fix MDCache::merge_dir()

fragment 'bits' should be negative for the merging case.

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 5652a08d757..5d0e6ca2ad0 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -10942,7 +10942,7 @@ void MDCache::merge_dir(CInode *diri, frag_t frag)
   dout(10) << " we are merginb by " << bits << " bits" << dendl;
 
   C_GatherBuilder gather(g_ceph_context,
-	  new C_MDC_FragmentFrozen(this, dirs, frag, bits));
+	  new C_MDC_FragmentFrozen(this, dirs, frag, -bits));
   fragment_freeze_dirs(dirs, gather);
   gather.activate();