Merge pull request #9592 from trociny/wip-15632

librbd: API methods to directly acquire and release the exclusive lock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

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

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

diff --cc src/librbd/CMakeLists.txt
index 9b304ecc875d76cc215eb84c1aa60fbc274f0c7a,c666f60448b050e1479de81d7e569f0ef2daa1a7..10cf8a5affc6160597ec6800f3534c665f8a83e4
--- 1/src/librbd/CMakeLists.txt
--- 2/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@@ -26,9 -26,8 +26,10 @@@ set(librbd_internal_src
    ObjectWatcher.cc 
    Operations.cc
    Utils.cc
 +  cache/ImageWriteback.cc
 +  cache/PassthroughImageCache.cc
    exclusive_lock/AcquireRequest.cc
+   exclusive_lock/AutomaticPolicy.cc
    exclusive_lock/ReacquireRequest.cc
    exclusive_lock/ReleaseRequest.cc
    exclusive_lock/StandardPolicy.cc

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

diff --cc src/librbd/Makefile.am
index 0067acf2596a8ce719e317e4973a4e3e6d0da110,8a18534e7a6a8dac21e10016aafed0faeb03befb..8d864d4370e1e0e620a28c95c06e0cfd12baaea8
--- 1/src/librbd/Makefile.am
--- 2/src/librbd/Makefile.am
+++ b/src/librbd/Makefile.am
@@@ -31,9 -31,8 +31,10 @@@ librbd_internal_la_SOURCES = 
        librbd/ObjectWatcher.cc \
        librbd/Operations.cc \
        librbd/Utils.cc \
 +      librbd/cache/ImageWriteback.cc \
 +      librbd/cache/PassthroughImageCache.cc \
        librbd/exclusive_lock/AcquireRequest.cc \
+       librbd/exclusive_lock/AutomaticPolicy.cc \
        librbd/exclusive_lock/ReacquireRequest.cc \
        librbd/exclusive_lock/ReleaseRequest.cc \
        librbd/exclusive_lock/StandardPolicy.cc \
@@@ -125,10 -124,8 +126,11 @@@ noinst_HEADERS += 
        librbd/TaskFinisher.h \
        librbd/Utils.h \
        librbd/WatchNotifyTypes.h \
 +      librbd/cache/ImageCache.h \
 +      librbd/cache/ImageWriteback.h \
 +      librbd/cache/PassthroughImageCache.h \
        librbd/exclusive_lock/AcquireRequest.h \
+       librbd/exclusive_lock/AutomaticPolicy.h \
        librbd/exclusive_lock/Policy.h \
        librbd/exclusive_lock/ReacquireRequest.h \
        librbd/exclusive_lock/ReleaseRequest.h \

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