From: Venky Shankar Date: Mon, 28 May 2018 04:53:30 +0000 (-0400) Subject: rbd-mirror: fix state comparison in Policy::is_state_scheduled() X-Git-Tag: v13.2.1~58^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=695f4e8e2027f33b5a9f5df63bdc08b6f240a234;p=ceph.git rbd-mirror: fix state comparison in Policy::is_state_scheduled() Signed-off-by: Venky Shankar (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 65d2596770f9..6718b10b7748 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