From: Jason Dillaman <dillaman@redhat.com>
Date: Sun, 11 Mar 2018 01:30:45 +0000 (-0500)
Subject: Merge pull request #20809 from idryomov/wip-librbd-discard-create-truncate
X-Git-Tag: v13.0.2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7351ce449bbaf2beb8b640a34b72618d504a457;p=ceph.git

Merge pull request #20809 from idryomov/wip-librbd-discard-create-truncate

librbd: create+truncate for whole-object layered discards

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

a7351ce449bbaf2beb8b640a34b72618d504a457
diff --cc src/test/librbd/io/test_mock_ObjectRequest.cc
index 496af7fb72be,449f8058c321..27eff02bd95a
--- a/src/test/librbd/io/test_mock_ObjectRequest.cc
+++ b/src/test/librbd/io/test_mock_ObjectRequest.cc
@@@ -876,7 -1003,9 +883,8 @@@ TEST_F(TestMockIoObjectRequest, Discard
    InSequence seq;
    expect_get_parent_overlap(mock_image_ctx, CEPH_NOSNAP, 4096, 0);
    expect_prune_parent_extents(mock_image_ctx, {{0, 4096}}, 4096, 4096);
-   expect_object_may_exist(mock_image_ctx, 0, true);
+   expect_object_may_exist(mock_image_ctx, 0, false);
 -  expect_object_map_update(mock_image_ctx, 0, 1, OBJECT_EXISTS, {}, false, 0);
+   expect_create(mock_image_ctx, false);
    expect_truncate(mock_image_ctx, 0, 0);
  
    C_SaferCond ctx;