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

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

diff --cc src/os/bluestore/BlueFS.cc
index 2f88acdc93b58a2b1059b1ea2f52ca28ebc183da,3b30722b652f5d2b48b34cb02a4d17c176d48518..50f293d45fd1b42c29dae52640c19761ce3669cd
--- 1/src/os/bluestore/BlueFS.cc
--- 2/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;

diff --cc src/test/objectstore/test_bluefs.cc
Simple merge