From cb840cc47d741a4e1bffa44b89c129fc1df6443b Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 4 Mar 2015 17:52:39 -0800 Subject: [PATCH] librbd: remove unneeded assert from unregister_watch() Calling this unconditionally in close_image() simplifies error handling when open_image() fails due to an error like EPERM from registering a watch. Signed-off-by: Josh Durgin --- src/librbd/ImageWatcher.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc index 3e0b522d246..d4aa428efe9 100644 --- a/src/librbd/ImageWatcher.cc +++ b/src/librbd/ImageWatcher.cc @@ -100,7 +100,6 @@ int ImageWatcher::unregister_watch() { int r = 0; { RWLock::WLocker l(m_watch_lock); - assert(m_watch_state != WATCH_STATE_UNREGISTERED); if (m_watch_state == WATCH_STATE_REGISTERED) { r = m_image_ctx.md_ctx.unwatch2(m_watch_handle); } -- 2.47.3