rbd-mirror: fix state comparison in Policy::is_state_scheduled()

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit bd83d93453b8fb7289594f8ad388f5c83bab84b9)

diff --git a/src/tools/rbd_mirror/image_map/Policy.cc b/src/tools/rbd_mirror/image_map/Policy.cc
index 65d2596770f9b646f00f020fd4ef9d221355cb16..6718b10b774875216b1f2830b45f5077a4ff11d2 100644 (file)
--- 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