update sources to v12.2.5

[ceph.git] / ceph / src / librbd / io / ObjectRequest.h

diff --git a/ceph/src/librbd/io/ObjectRequest.h b/ceph/src/librbd/io/ObjectRequest.h
index a015fb199ec9508580ce5f995037b008a82b20f0..f59ec2e2a1a7d4c2a571addbb01efcc8d84be9de 100644 (file)
--- a/ceph/src/librbd/io/ObjectRequest.h
+++ b/ceph/src/librbd/io/ObjectRequest.h
@@ -366,7 +366,7 @@ public:
     case DISCARD_ACTION_REMOVE:
       return "remove";
     case DISCARD_ACTION_REMOVE_TRUNCATE:
-      return "remove (truncate)";
+      return "remove (create+truncate)";
     case DISCARD_ACTION_TRUNCATE:
       return "truncate";
     case DISCARD_ACTION_ZERO:
@@ -404,6 +404,8 @@ protected:
       wr->remove();
       break;
     case DISCARD_ACTION_REMOVE_TRUNCATE:
+      wr->create(false);
+      // fall through
     case DISCARD_ACTION_TRUNCATE:
       wr->truncate(this->m_object_off);
       break;