1.1 --- a/files/block_file_accessor.cc Sun Apr 11 19:34:07 2021 +0200
1.2 +++ b/files/block_file_accessor.cc Mon Apr 12 00:12:51 2021 +0200
1.3 @@ -1,10 +1,9 @@
1.4 #include <stdio.h>
1.5 +#include <stdlib.h>
1.6 #include <string.h>
1.7 #include <sys/types.h>
1.8 #include <sys/stat.h>
1.9
1.10 -#include <algorithm>
1.11 -
1.12 #include "block_file_accessor.h"
1.13
1.14
1.15 @@ -69,8 +68,11 @@
1.16 void BlockFileAccessor::fill_populated(Flexpage *flexpage)
1.17 {
1.18 offset_t filepos = flexpage->base_offset;
1.19 - offset_t addr = flexpage->base_addr;
1.20 - offset_t populated_size = std::min(flexpage->size, _size - filepos);
1.21 + address_t addr = flexpage->base_addr;
1.22 + offset_t populated_size = _size - filepos;
1.23 +
1.24 + if (populated_size > flexpage->size)
1.25 + populated_size = flexpage->size;
1.26
1.27 /* Tag the region with file state. */
1.28
1.29 @@ -91,8 +93,11 @@
1.30 void BlockFileAccessor::flush_populated(Flexpage *flexpage)
1.31 {
1.32 offset_t filepos = flexpage->base_offset;
1.33 - offset_t addr = flexpage->base_addr;
1.34 - offset_t populated_size = std::min(flexpage->size, _size - filepos);
1.35 + address_t addr = flexpage->base_addr;
1.36 + offset_t populated_size = _size - filepos;
1.37 +
1.38 + if (populated_size > flexpage->size)
1.39 + populated_size = flexpage->size;
1.40
1.41 /* Remove the file state tag from the region. */
1.42