import quincy beta 17.1.0

[ceph.git] / ceph / src / test / librbd / exclusive_lock / test_mock_PreReleaseRequest.cc

diff --git a/ceph/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc b/ceph/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc
index ceb45ca2e68b45c5b646c2419e2bb9b737deef03..466a3ab421e545de01afb8111eb2499b161429f0 100644 (file)
--- a/ceph/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc
+++ b/ceph/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc
@@ -102,9 +102,14 @@ public:
     if (!mock_image_ctx.clone_copy_on_read) {
       expect_test_features(mock_image_ctx, RBD_FEATURE_JOURNALING,
                            ((mock_image_ctx.features & RBD_FEATURE_JOURNALING) != 0));
+      if ((mock_image_ctx.features & RBD_FEATURE_JOURNALING) == 0) {
+        expect_test_features(mock_image_ctx, RBD_FEATURE_DIRTY_CACHE,
+                             ((mock_image_ctx.features & RBD_FEATURE_DIRTY_CACHE) != 0));
+      }
     }
     if (mock_image_ctx.clone_copy_on_read ||
-        (mock_image_ctx.features & RBD_FEATURE_JOURNALING) != 0) {
+        (mock_image_ctx.features & RBD_FEATURE_JOURNALING) != 0 ||
+        (mock_image_ctx.features & RBD_FEATURE_DIRTY_CACHE) != 0) {
       expect_set_require_lock(mock_image_dispatch, init_shutdown,
                               librbd::io::DIRECTION_BOTH, r);
     } else {