Skip to content

Commit 40936ff

Browse files
committed
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 <[email protected]>
2 parents a302e3b + f50693f commit 40936ff

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

src/mds/Locker.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5778,6 +5778,7 @@ void Locker::handle_file_lock(ScatterLock *lock, const cref_t<MLock> &m)
57785778
case LOCK_AC_SYNC:
57795779
ceph_assert(lock->get_state() == LOCK_LOCK ||
57805780
lock->get_state() == LOCK_MIX ||
5781+
lock->get_state() == LOCK_MIX_SYNC ||
57815782
lock->get_state() == LOCK_MIX_SYNC2);
57825783

57835784
if (lock->get_state() == LOCK_MIX) {

0 commit comments

Comments
 (0)