From 44351860e570b295077096e3780dd9d1b3492019 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Thu, 21 Jul 2016 15:42:10 +0100 Subject: [PATCH 1/3] [many tools] fix bug in previous patch --- base/output_file_requirements.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/base/output_file_requirements.cc b/base/output_file_requirements.cc index 001e127..fefdc0f 100644 --- a/base/output_file_requirements.cc +++ b/base/output_file_requirements.cc @@ -37,14 +37,17 @@ base::check_output_file_requirements(string const &path) explain_output_file_requirements(); } - if (!info.st_size) { - cerr << "Zero size output file.\n\n"; - explain_output_file_requirements(); - } + // We only really want these checks for regular files + if (S_ISREG(info.st_mode)) { + if (!info.st_size) { + cerr << "Zero size output file.\n\n"; + explain_output_file_requirements(); + } - if (info.st_size < MIN_SIZE) { - cerr << "Output file too small.\n\n"; - explain_output_file_requirements(); + if (info.st_size < MIN_SIZE) { + cerr << "Output file too small.\n\n"; + explain_output_file_requirements(); + } } } From 49bfc12e9c7956c1ac134b24afbe1a6a602ce7d5 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Thu, 21 Jul 2016 15:42:52 +0100 Subject: [PATCH 2/3] bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b616048..844f6a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.2 +0.6.3 From 6c1be8d6faa83ae082804ff301c9da45f4131541 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Thu, 6 Oct 2016 22:36:12 +0800 Subject: [PATCH 3/3] [block-cache] Fix error handling in reading libaio events io_event::res is a signed int64 in kernel, but libaio defines it as unsigned long. We should cast it to a signed value. --- block-cache/block_cache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block-cache/block_cache.cc b/block-cache/block_cache.cc index 6ecce1f..3699d4b 100644 --- a/block-cache/block_cache.cc +++ b/block-cache/block_cache.cc @@ -213,7 +213,7 @@ block_cache::wait_io() if (e.res == block_size_ << SECTOR_SHIFT) complete_io(*b, 0); - else if (e.res < 0) + else if (static_cast(e.res) < 0) complete_io(*b, e.res); else {