Merge pull request #7529 from dillaman/wip-14412

librbd: journal framework for tracking exclusive lock transitions Reviewed-by: Josh Durgin <jdurgin@redhat.com>
ceph · Feb 6, 2016 · 2b2ce9b · 2b2ce9b
2 parents 2e4fa4b + 9418f05
commit 2b2ce9b
Show file tree

Hide file tree

Showing 46 changed files with 2,061 additions and 472 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1031,8 +1031,8 @@ if(${WITH_RBD})
     librbd/image/RefreshParentRequest.cc
     librbd/image/RefreshRequest.cc
     librbd/image/SetSnapRequest.cc
-    librbd/journal/Entries.cc
     librbd/journal/Replay.cc
+    librbd/journal/Types.cc
     librbd/object_map/InvalidateRequest.cc
     librbd/object_map/LockRequest.cc
     librbd/object_map/Request.cc