Merge pull request #5296 from ceph/wip-12345-hammer

librbd: correct issues discovered via lockdep / helgrind

Reviewed-by: Loic Dachary <ldachary@redhat.com>

diff --cc configure.ac
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/librbd/ObjectMap.h
Simple merge

diff --cc src/librbd/internal.cc
index 15ea41662d4b9a4a8fd179c600b90de881691974,a5c5f204dd4dabc4249e66cfc7030db8cb7b644c..447e9d00cd5c7b08f7892accceb4a91cbf6e3570
--- 1/src/librbd/internal.cc
--- 2/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@@ -1620,10 -1625,9 +1625,8 @@@ reprotect_and_return_err
          close_image(ictx);
          return -EBUSY;
        }
 -      assert(watchers.size() == 1);
  
-       ictx->md_lock.get_read();
        trim_image(ictx, 0, prog_ctx);
-       ictx->md_lock.put_read();
  
        ictx->parent_lock.get_read();
        // struct assignment

diff --cc src/log/Log.cc
Simple merge