From f9430fe5692cdf11982caab6dcab333b60c1b9f5 Mon Sep 17 00:00:00 2001 From: sageweil Date: Thu, 7 Jun 2007 00:34:07 +0000 Subject: [PATCH] * bugfix on filelock caps callback git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1410 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/sage/cephmds2/mds/Locker.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/branches/sage/cephmds2/mds/Locker.cc b/branches/sage/cephmds2/mds/Locker.cc index 836b76ca96698..87fb8abaab45f 100644 --- a/branches/sage/cephmds2/mds/Locker.cc +++ b/branches/sage/cephmds2/mds/Locker.cc @@ -2199,21 +2199,18 @@ void Locker::handle_file_lock(FileLock *lock, MLock *m) assert(lock->get_state() == LOCK_SYNC || lock->get_state() == LOCK_MIXED); + lock->set_state(LOCK_GLOCKR); + // call back caps? if (issued & CAP_FILE_RD) { dout(7) << "handle_file_lock client readers, gathering caps on " << *in << endl; issue_caps(in); + break; } if (lock->is_rdlocked()) { dout(7) << "handle_file_lock rdlocked, waiting before ack on " << *in << endl; - lock->set_state(LOCK_GLOCKR); break; } - if (issued & CAP_FILE_RD) { - dout(7) << "handle_file_lock RD cap issued, waiting before ack on " << *in << endl; - lock->set_state(LOCK_GLOCKR); - break; - } // nothing to wait for, lock and ack. { -- 2.39.5