From: Adam Kupczyk <akupczyk@ibm.com>
Date: Fri, 17 Jan 2025 08:31:32 +0000 (+0100)
Subject: Merge pull request #60556 from aclamk/wip-aclamk-bluefs-truncate-allocations-main
X-Git-Tag: v20.0.0~376
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11086d8a1ffdd294bb574f18a8ea03a327a6ba0e;p=ceph.git

Merge pull request #60556 from aclamk/wip-aclamk-bluefs-truncate-allocations-main

os/bluestore: Make truncate() drop unused allocations - addendum
---

11086d8a1ffdd294bb574f18a8ea03a327a6ba0e
diff --cc src/os/bluestore/BlueFS.cc
index 2f88acdc93b,3b30722b652..50f293d45fd
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@@ -3829,9 -3822,7 +3830,8 @@@ int BlueFS::truncate(FileWriter *h, uin
      }
      if (changed_extents) {
        fnode.size = offset;
-       fnode.allocated = new_allocated;
        fnode.reset_delta();
 +      fnode.recalc_allocated();
        log.t.op_file_update(fnode);
        // sad, but is_dirty must be set to signal flushing of the log
        h->file->is_dirty = true;