diff options
author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-09-19 13:42:41 +0800 |
---|---|---|
committer | Yan, Zheng <zheng.z.yan@intel.com> | 2013-10-05 11:31:11 +0800 |
commit | 473635ab03bdeb9e591a15ff9eb9fcae08ec272f (patch) | |
tree | 2c4a3ec71223f180a527a509fae5c81a6003bac1 | |
parent | a242201d58f5facb4eefcde38e3fd5e9d6f61de7 (diff) | |
download | ceph-473635ab03bdeb9e591a15ff9eb9fcae08ec272f.tar.gz |
mds: fix MDCache::merge_dir()
fragment 'bits' should be negative for the merging case.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
-rw-r--r-- | src/mds/MDCache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |