From bd83d93453b8fb7289594f8ad388f5c83bab84b9 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Mon, 28 May 2018 00:53:30 -0400 Subject: [PATCH] rbd-mirror: fix state comparison in Policy::is_state_scheduled() Signed-off-by: Venky Shankar --- src/tools/rbd_mirror/image_map/Policy.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tools/rbd_mirror/image_map/Policy.cc b/src/tools/rbd_mirror/image_map/Policy.cc index 65d2596770f9b..6718b10b77487 100644 --- a/src/tools/rbd_mirror/image_map/Policy.cc +++ b/src/tools/rbd_mirror/image_map/Policy.cc @@ -395,9 +395,8 @@ bool Policy::set_state(ImageState* image_state, StateTransition::State state, bool Policy::is_state_scheduled(const ImageState& image_state, StateTransition::State state) const { - return (image_state.state == StateTransition::STATE_DISSOCIATING || - (image_state.next_state && - *image_state.next_state == StateTransition::STATE_DISSOCIATING)); + return (image_state.state == state || + (image_state.next_state && *image_state.next_state == state)); } } // namespace image_map -- 2.39.5