From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 5 Sep 2016 01:54:36 +0000 (-0400)
Subject: Merge pull request #9592 from trociny/wip-15632
X-Git-Tag: v11.0.1~329
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fdd236476c436eaa15be2edc05d06187ed753b3e;p=ceph.git

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>
---

fdd236476c436eaa15be2edc05d06187ed753b3e
diff --cc src/librbd/CMakeLists.txt
index 9b304ecc875,c666f60448b..10cf8a5affc
--- a/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/Makefile.am
index 0067acf2596,8a18534e7a6..8d864d4370e
--- a/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 \