]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix lock state assert on sync->excl
authorSage Weil <sage@newdream.net>
Tue, 4 Aug 2009 21:10:50 +0000 (14:10 -0700)
committerSage Weil <sage@newdream.net>
Tue, 4 Aug 2009 22:33:36 +0000 (15:33 -0700)
src/mds/Locker.cc

index 8a06afa972cc008bb5f3345e3426013dd1c08215..810c8c0ca7e0a7dcd3776d06a03ec3345423b571 100644 (file)
@@ -2362,7 +2362,8 @@ void Locker::handle_simple_lock(SimpleLock *lock, MLock *m)
 
     // -- auth --
   case LOCK_AC_LOCKACK:
-    assert(lock->get_state() == LOCK_SYNC_LOCK);
+    assert(lock->get_state() == LOCK_SYNC_LOCK ||
+          lock->get_state() == LOCK_SYNC_EXCL);
     assert(lock->is_gathering(from));
     lock->remove_gather(from);