From: Sage Weil <sage@newdream.net>
Date: Wed, 13 Apr 2011 19:03:31 +0000 (-0700)
Subject: mds: fix dn unlocking on export_reverse
X-Git-Tag: v0.27~75
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e0565cdef3f25b9c26b512d8b2e7508bfaf05aa;p=ceph.git

mds: fix dn unlocking on export_reverse

Triggered by mds_kill_import_at 5.  We were clearing the export_locks
prior to calling export_unlock (der!).

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index aa33ee6870096..95e165d4a9023 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -266,7 +266,6 @@ void Migrator::handle_mds_failure_or_stop(int who)
 	export_state.erase(dir); // clean up
 	export_locks.erase(dir);
 	dir->state_clear(CDir::STATE_EXPORTING);
-	export_unlock(dir);
 	break;
 
       case EXPORT_LOGGINGFINISH:
@@ -1305,6 +1304,8 @@ void Migrator::export_reverse(CDir *dir)
   // unfreeze
   dir->unfreeze_tree();
 
+  export_unlock(dir);
+
   cache->show_cache();
 }