Skip to content

Commit c8d3efb

Browse files
authored
Merge pull request ceph#61835 from nbalacha/wip-nbalacha-69978
rbd-mirror: fix possible recursive lock of ImageReplayer::m_lock Reviewed-by: Ilya Dryomov <[email protected]>
2 parents 92ef6ae + c605140 commit c8d3efb

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/tools/rbd_mirror/ImageReplayer.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,10 +719,12 @@ void ImageReplayer<I>::handle_update_mirror_image_replay_status(int r) {
719719
auto ctx = new LambdaContext([this](int) {
720720
update_mirror_image_status(false, boost::none);
721721

722-
std::unique_lock locker{m_lock};
723-
std::unique_lock timer_locker{m_threads->timer_lock};
722+
{
723+
std::unique_lock locker{m_lock};
724+
std::unique_lock timer_locker{m_threads->timer_lock};
724725

725-
schedule_update_mirror_image_replay_status();
726+
schedule_update_mirror_image_replay_status();
727+
}
726728
m_in_flight_op_tracker.finish_op();
727729
});
728730

0 commit comments

Comments
 (0)