From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 20 Jan 2015 13:11:08 +0000 (+0800)
Subject: mds: fix rdlock snap inode
X-Git-Tag: v0.93~87^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6cb9b01fb68eeb1449af0d145f31ee813a5316d2;p=ceph.git

mds: fix rdlock snap inode

make sure the "sync head inode" code  execute

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 212a042c5833..02844864009f 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1253,9 +1253,6 @@ bool Locker::rdlock_start(SimpleLock *lock, MDRequestRef& mut, bool as_anon)
       return true;
     }
 
-    if (!_rdlock_kick(lock, as_anon))
-      break;
-
     // hmm, wait a second.
     if (in && !in->is_head() && in->is_auth() &&
 	lock->get_state() == LOCK_SNAP_SYNC) {
@@ -1270,6 +1267,9 @@ bool Locker::rdlock_start(SimpleLock *lock, MDRequestRef& mut, bool as_anon)
 	// oh, check our lock again then
       }
     }
+
+    if (!_rdlock_kick(lock, as_anon))
+      break;
   }
 
   // wait!