Merge remote-tracking branch 'origin/wip-10785' into hammer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
	src/librbd/ImageWatcher.cc

diff --cc src/librbd/ImageWatcher.cc
index 3d55b5e71973cfb744f9bc225037da88a60bda46,30e0a19618511d202fdb7983558b11a296c62322..60b4756affa80036e27eff216e967fd809d764a7
--- 1/src/librbd/ImageWatcher.cc
--- 2/src/librbd/ImageWatcher.cc
+++ b/src/librbd/ImageWatcher.cc
@@@ -184,21 -184,7 +184,21 @@@ int ImageWatcher::try_lock() 
        }
      }
  
-     ldout(m_image_ctx.cct, 1) << "breaking exclusive lock: " << locker << dendl;
 +    md_config_t *conf = m_image_ctx.cct->_conf;
 +    if (conf->rbd_blacklist_on_break_lock) {
 +      ldout(m_image_ctx.cct, 1) << "blacklisting client: " << locker << "@"
 +                              << locker_address << dendl;
 +      librados::Rados rados(m_image_ctx.md_ctx);
 +      r = rados.blacklist_add(locker_address,
 +                            conf->rbd_blacklist_expire_seconds);
 +      if (r < 0) {
 +        lderr(m_image_ctx.cct) << "unable to blacklist client: "
 +                             << cpp_strerror(r) << dendl;
 +        return r;
 +      }
 +    }
 +
+     ldout(m_image_ctx.cct, 5) << "breaking exclusive lock: " << locker << dendl;
      r = rados::cls::lock::break_lock(&m_image_ctx.md_ctx,
                                       m_image_ctx.header_oid, RBD_LOCK_NAME,
                                       locker_cookie, locker);

diff --cc src/librbd/internal.cc
Simple merge

diff --cc src/test/librbd/test_ImageWatcher.cc
Simple merge