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

Merge branch '2015-08-19-thin-show-duplicates' into merge-thin-ls

Browse Source 
Conflicts:
	Makefile.in
	block-cache/block_cache.h
	main.cc
	thin-provisioning/commands.h
This commit is contained in:
Joe Thornber
2016-02-24 14:31:51 +00:00
parent 5f879237f5 664841ad03
commit a5a53648c9
25 changed files with 1477 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block-cache/block_cache.cc
View File

@@ -188,7 +188,7 @@ block_cache::wait_io()
for (i = 0; i < static_cast<unsigned>(r); i++) {
io_event const &e = events_[i];
block *b = container_of(e.obj, &block::control_block_);
block *b = base::container_of(e.obj, &block::control_block_);
if (e.res == block_size_ << SECTOR_SHIFT)
complete_io(*b, 0);