Merge PR ceph#54687 into main

* refs/pull/54687/head: mds: allow lock state to be LOCK_MIX_SYNC in replica for filelock Reviewed-by: Venky Shankar <vshankar@redhat.com>
scantist-ossops-m2 · Feb 27, 2024 · 40936ff · 40936ff
2 parents a302e3b + f50693f
commit 40936ff
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
@@ -5778,6 +5778,7 @@ void Locker::handle_file_lock(ScatterLock *lock, const cref_t<MLock> &m)
   case LOCK_AC_SYNC:
     ceph_assert(lock->get_state() == LOCK_LOCK ||
 	   lock->get_state() == LOCK_MIX ||
+	   lock->get_state() == LOCK_MIX_SYNC ||
 	   lock->get_state() == LOCK_MIX_SYNC2);
 
     if (lock->get_state() == LOCK_MIX) {