emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[thin_show_duplicates] Fix potential errors

Browse Source 
- Fix error if no --block-sector provided
- Fix errors on pools without mappings, or zero-length file
This commit is contained in:
Ming-Hung Tsai
2021-06-02 01:23:13 +08:00
parent 75c0a3656c
commit 759407445f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
thin-provisioning/thin_show_duplicates.cc
View File

@@ -56,7 +56,7 @@ using namespace thin_provisioning;
namespace { namespace {
bool factor_of(block_address f, block_address n) { bool factor_of(block_address f, block_address n) {
return (n % f) == 0; return f && (n % f) == 0;
} }
uint64_t parse_int(string const &str, string const &desc) { uint64_t parse_int(string const &str, string const &desc) {
@@ -132,11 +132,15 @@ namespace {
class duplicate_detector { class duplicate_detector {
public: public:
void scan_with_variable_sized_chunks(chunk_stream &stream) { void scan_with_variable_sized_chunks(chunk_stream &stream) {
if (!stream.size())
return;
variable_chunk_stream vstream(stream, 4096); variable_chunk_stream vstream(stream, 4096);
scan(vstream); scan(vstream);
} }
void scan_with_fixed_sized_chunks(chunk_stream &stream, block_address chunk_size) { void scan_with_fixed_sized_chunks(chunk_stream &stream, block_address chunk_size) {
if (!stream.size())
return;
fixed_chunk_stream fstream(stream, chunk_size); fixed_chunk_stream fstream(stream, chunk_size);
scan(fstream); scan(fstream);
} }
@@ -222,7 +226,7 @@ namespace {
if (fs.content_based_chunks) if (fs.content_based_chunks)
detector.scan_with_variable_sized_chunks(pstream); detector.scan_with_variable_sized_chunks(pstream);
else { else {
if (*fs.block_size) { if (!!fs.block_size) {
if (factor_of(*fs.block_size, block_size)) if (factor_of(*fs.block_size, block_size))
block_size = *fs.block_size; block_size = *fs.block_size;
else else