From: Sage Weil <sage@newdream.net>
Date: Tue, 27 May 2008 21:41:17 +0000 (-0700)
Subject: mds: fix conditional for srci export finish (didnt account for link merge)
X-Git-Tag: v0.3~170^2~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cff97a96685a37ad71adc407b32d18006cf9ba31;p=ceph.git

mds: fix conditional for srci export finish (didnt account for link merge)
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index adecbd7aea6..6c7af359cc7 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -3762,7 +3762,8 @@ void Server::_commit_slave_rename(MDRequest *mdr, int r,
 
   // unfreeze+singleauth inode
   //  hmm, do i really need to delay this?
-  if (srcdn->is_auth() && destdn->is_primary()) {
+  if (srcdn->is_auth() && destdn->is_primary() &&
+      destdn->inode->state_test(CInode::STATE_AMBIGUOUSAUTH)) {
     dout(10) << " unfreezing exported inode " << *destdn->inode << dendl;
     list<Context*> finished;