From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 5 Mar 2015 01:52:39 +0000 (-0800)
Subject: librbd: remove unneeded assert from unregister_watch()
X-Git-Tag: v0.94~60^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb840cc47d741a4e1bffa44b89c129fc1df6443b;p=ceph.git

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 <jdurgin@redhat.com>
---

diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc
index 3e0b522d246a..d4aa428efe9a 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);
     }