Merge from blktap2

Periodic merge from blktap2 (https://github.com/xapi-project/blktap) to ensure we're kept in sync. Conflicts: .gitignore Signed-off-by: Thanos Makatos <thanos.makatos@citrix.com>
xapi-project · Jan 31, 2014 · a95d653 · a95d653
2 parents 7bb0ea7 + 57ee889
commit a95d653
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ Makefile.in
 /vhd/lib/Makefile
 /vhd/lib/test/Makefile
 /tapback/Makefile
+mk/config.log
 
 # dist output
 /blktap-*.tar.*
@@ -69,5 +70,3 @@ tags
 
 # diff/patch
 *.orig
-
-mk/config.log
diff --git a/drivers/block-vhd.c b/drivers/block-vhd.c
@@ -1310,7 +1310,7 @@ reserve_new_block(struct vhd_state *s, uint32_t blk)
 		gap = (s->spp - ((s->next_db + s->bm_secs) % s->spp));
 
 	if (s->next_db + gap > UINT_MAX)
-		return (uint64_t)EIO << 32;
+		return (uint64_t)ENOSPC << 32;
 
 	s->bat.pbw_blk    = blk;
 	s->bat.pbw_offset = s->next_db + gap;
@@ -1496,7 +1496,7 @@ allocate_block(struct vhd_state *s, uint32_t blk)
 	}
 
 	if (next_db > UINT_MAX)
-		return -EIO;
+		return -ENOSPC;
 
 	s->next_db = next_db;