This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 049f9ef6dac7f098a177985423415d15e2a2114b Author: JosiahWI <[email protected]> AuthorDate: Wed Mar 26 15:57:10 2025 -0500 Fix narrowing conversion in StripeSM construction (#12127) (cherry picked from commit 090141a380558446621d920064a7f958ac5e5e43) --- src/iocore/cache/PreservationTable.cc | 2 +- src/iocore/cache/PreservationTable.h | 2 +- src/iocore/cache/StripeSM.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/iocore/cache/PreservationTable.cc b/src/iocore/cache/PreservationTable.cc index f8ad81fdef..0c5dc3b710 100644 --- a/src/iocore/cache/PreservationTable.cc +++ b/src/iocore/cache/PreservationTable.cc @@ -45,7 +45,7 @@ DbgCtl dbg_ctl_cache_evac{"cache_evac"}; } // namespace -PreservationTable::PreservationTable(int size) : evacuate_size{(size / EVACUATION_BUCKET_SIZE) + 2} +PreservationTable::PreservationTable(off_t size) : evacuate_size{static_cast<int>(size / EVACUATION_BUCKET_SIZE) + 2} { ink_assert(size > 0); int evac_len = this->evacuate_size * sizeof(DLL<EvacuationBlock>); diff --git a/src/iocore/cache/PreservationTable.h b/src/iocore/cache/PreservationTable.h index acf762cce9..1b55258f02 100644 --- a/src/iocore/cache/PreservationTable.h +++ b/src/iocore/cache/PreservationTable.h @@ -110,7 +110,7 @@ public: * @param size The total number of directory entries the table must * be able to store. The size must be a positive number. */ - PreservationTable(int size); + PreservationTable(off_t size); ~PreservationTable(); diff --git a/src/iocore/cache/StripeSM.cc b/src/iocore/cache/StripeSM.cc index bcbf3360f6..b4066e8cc6 100644 --- a/src/iocore/cache/StripeSM.cc +++ b/src/iocore/cache/StripeSM.cc @@ -117,7 +117,7 @@ StripeSM::StripeSM(CacheDisk *disk, off_t blocks, off_t dir_skip, int avg_obj_si Stripe{disk, blocks, dir_skip, avg_obj_size, fragment_size}, fd{disk->fd}, disk{disk}, - _preserved_dirs{static_cast<int>(len)} + _preserved_dirs{len} { open_dir.mutex = this->mutex; SET_HANDLER(&StripeSM::aggWrite);
