Merge branch 'master' of github.com:jthornber/thin-provisioning-tools

thin-provisioning/thin_generate_mappings.cc

@@ -93,10 +93,8 @@ namespace {
 		io_generator::ptr gen = create_io_generator(opts);
 
 		base::io io;
-		while (gen->has_next()) {
+		while (gen->next(io)) {
 			// TODO: support io.size_
-			gen->next(io);
-
 			switch (io.op_) {
 			case base::REQ_OP_READ:
 				process_read(td, pool, io.sector_);
@@ -131,10 +129,10 @@ thin_generate_mappings_cmd::usage(std::ostream &out) const
 	    << "  {-h|--help}\n"
 	    << "  {-o|--output} <output device or file>\n"
 	    << "  {--dev-id} <dev-id>\n"
-	    << "  {--offset} <offset>\n"
-            << "  {--io-size} <io_size>\n"
+	    << "  {--offset} <offset in sectors>\n"
+	    << "  {--io-size} <io-size in sectors>\n"
 	    << "  {--rw write|trim|randwrite|randtrim|randtw}\n"
-            << "  {--size} <size>\n"
+	    << "  {--size} <size in sectors>\n"
 	    << "  {-V|--version}" << endl;
 }
 

thin-provisioning/thin_pool.cc

@@ -72,13 +72,16 @@ thin::insert(block_address thin_block, block_address data_block)
 {
 	uint64_t key[2] = {dev_, thin_block};
 
-	++details_.mapped_blocks_;
-	changed_ = true;
-
 	mapping_tree_detail::block_time bt;
 	bt.block_ = data_block;
 	bt.time_ = pool_.get_time();
-	return pool_.md_->mappings_->insert(key, bt);
+	bool inserted = pool_.md_->mappings_->insert(key, bt);
+
+	changed_ = true;
+	if (inserted)
+		++details_.mapped_blocks_;
+
+	return inserted;
 }
 
 void