From b1d3dbd934361e722d1f73c6db33fea62ddf94c9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Jun 2008 14:33:29 -0700 Subject: [PATCH] mds: wait_for_sync for predirty/dirty cycle in try_subtree_merge_at --- src/mds/MDCache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 8de323be5ca61..208ffffe8fedf 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -505,7 +505,7 @@ void MDCache::try_subtree_merge_at(CDir *dir) le->metablob.add_primary_dentry(in->get_parent_dn(), true, 0, pi); mds->mdlog->submit_entry(le); - mds->mdlog->wait_for_safe(new C_MDC_SubtreeMergeWB(this, in, + mds->mdlog->wait_for_sync(new C_MDC_SubtreeMergeWB(this, in, mds->mdlog->get_current_segment())); } } -- 2.39.5