mds: fix filelock eval_gather

Broken by a08d62045657713bf0a5372bf14136082ec3b17e

Reported-by: Yan, Zheng <yan.zheng@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 951ba764ca6ef37d1c289d30cd97b1739c6aa0da..8065207011a294c78c71cdeba3870f3ca5310215 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -655,12 +655,13 @@ void Locker::eval_gather(SimpleLock *lock, bool first, bool *pneed_issue, list<C
       assert(in);
       if (in->state_test(CInode::STATE_RECOVERING)) {
        dout(7) << "eval_gather finished gather, but still recovering" << dendl;
+       return;
       } else if (in->state_test(CInode::STATE_NEEDSRECOVER)) {
        dout(7) << "eval_gather finished gather, but need to recover" << dendl;
        mds->mdcache->queue_file_recover(in);
        mds->mdcache->do_file_recover();
+       return;
       }
-      return;
     }
 
     if (!lock->get_parent()->is_auth()) {