]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mds: PurgeQueue.cc fix for 32bit compilation 44169/head
authorDuncan Bellamy <dunk@denkimushi.com>
Sat, 8 May 2021 10:52:35 +0000 (11:52 +0100)
committerCory Snyder <csnyder@iland.com>
Wed, 1 Dec 2021 19:50:05 +0000 (14:50 -0500)
commit2924236945c17b180d26968f30acebc72e1cfd43
treeb3cf9e4e2b0121a3893d6243864f54025ede1292
parentfe63bec3382a149b52666f29358580c48ad8772b
mds: PurgeQueue.cc fix for 32bit compilation

files_high_water is defined as uint64_t but when compiling on 32bit these max functions
fail as they are both not considered uint64_t by gcc 10 even though they are

  files_high_water = std::max(files_high_water,
                               static_cast<uint64_t>(in_flight.size()));

Fixes: https://tracker.ceph.com/issues/50707
Signed-off-by: Duncan Bellamy <dunk@denkimushi.com>
(cherry picked from commit 0b7f69252c7701f70d38cc6221d393cbd5a507a4)

Conflicts:
src/mds/PurgeQueue.cc

Cherry-pick notes:
- Octopus did not previously have static_cast to uint64
src/mds/PurgeQueue.cc