Reviewed-by: Greg Farnum <greg@xxxxxxxxxxx> On Sun, Mar 17, 2013 at 7:51 AM, Yan, Zheng <zheng.z.yan@xxxxxxxxx> wrote: > From: "Yan, Zheng" <zheng.z.yan@xxxxxxxxx> > > Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx> > --- > src/mds/Migrator.cc | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc > index f563b8d..9cbad87 100644 > --- a/src/mds/Migrator.cc > +++ b/src/mds/Migrator.cc > @@ -1340,10 +1340,6 @@ void Migrator::export_reverse(CDir *dir) > set<CDir*> bounds; > cache->get_subtree_bounds(dir, bounds); > > - // adjust auth, with possible subtree merge. > - cache->adjust_subtree_auth(dir, mds->get_nodeid()); > - cache->try_subtree_merge(dir); // NOTE: may journal subtree_map as side-effect > - > // remove exporting pins > list<CDir*> rq; > rq.push_back(dir); > @@ -1371,6 +1367,10 @@ void Migrator::export_reverse(CDir *dir) > bd->state_clear(CDir::STATE_EXPORTBOUND); > } > > + // adjust auth, with possible subtree merge. > + cache->adjust_subtree_auth(dir, mds->get_nodeid()); > + cache->try_subtree_merge(dir); // NOTE: may journal subtree_map as side-effect > + > // notify bystanders > export_notify_abort(dir, bounds); > > -- > 1.7.11.7 > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
