Merge branch 'master' of github.com:jthornber/thin-provisioning-tools into 2016-14-08-cache-format2

Conflicts:
	VERSION
This commit is contained in:
Joe Thornber 2017-03-08 10:47:38 -05:00
commit d24dba9ebb

View File

@ -193,7 +193,7 @@ block_cache::wait_io()
if (e.res == block_size_ << SECTOR_SHIFT) if (e.res == block_size_ << SECTOR_SHIFT)
complete_io(*b, 0); complete_io(*b, 0);
else if (e.res < 0) else if (static_cast<long>(e.res) < 0)
complete_io(*b, e.res); complete_io(*b, e.res);
else { else {