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 5652a08d757ecd691e423e046e15d749d3544b83..5d0e6ca2ad029dd235962f1fd2fdb333cd6f29aa 100644 (file)
--- 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();