diff --git a/src/librbd/MirroringWatcher.cc b/src/librbd/MirroringWatcher.cc index d142ae3593bf2..ffed247cfc8e4 100644 --- a/src/librbd/MirroringWatcher.cc +++ b/src/librbd/MirroringWatcher.cc @@ -61,7 +61,7 @@ int MirroringWatcher::notify_image_updated( } template -int MirroringWatcher::notify_image_updated( +void MirroringWatcher::notify_image_updated( librados::IoCtx &io_ctx, cls::rbd::MirrorImageState mirror_image_state, const std::string &image_id, const std::string &global_image_id, Context *on_finish) { @@ -75,12 +75,8 @@ int MirroringWatcher::notify_image_updated( librados::AioCompletion *comp = util::create_rados_ack_callback(on_finish); int r = io_ctx.aio_notify(RBD_MIRRORING, comp, bl, NOTIFY_TIMEOUT_MS, nullptr); - if (r < 0) { - lderr(cct) << ": error encountered sending image updated notification: " - << cpp_strerror(r) << dendl; - return r; - } - return 0; + assert(r == 0); + comp->release(); } template diff --git a/src/librbd/MirroringWatcher.h b/src/librbd/MirroringWatcher.h index 9111682a2e2f0..09155c42aae55 100644 --- a/src/librbd/MirroringWatcher.h +++ b/src/librbd/MirroringWatcher.h @@ -29,11 +29,11 @@ class MirroringWatcher : public ObjectWatcher { cls::rbd::MirrorImageState mirror_image_state, const std::string &image_id, const std::string &global_image_id); - static int notify_image_updated(librados::IoCtx &io_ctx, - cls::rbd::MirrorImageState mirror_image_state, - const std::string &image_id, - const std::string &global_image_id, - Context *on_finish); + static void notify_image_updated(librados::IoCtx &io_ctx, + cls::rbd::MirrorImageState mirror_image_state, + const std::string &image_id, + const std::string &global_image_id, + Context *on_finish); virtual void handle_mode_updated(cls::rbd::MirrorMode mirror_mode, Context *on_ack) = 0;