Index: uspace/lib/fdisk/src/fdisk.c
===================================================================
--- uspace/lib/fdisk/src/fdisk.c	(revision f57ccb5dbdad2edb2def6970e5d20849ccd9daa9)
+++ uspace/lib/fdisk/src/fdisk.c	(revision 372df8f916002c4dcfde6b3bfe02589b3c2f10da)
@@ -133,5 +133,7 @@
 	list_initialize(&devlist->devinfos);
 
-	rc = vol_get_disks(fdisk->vol, &svcs, &count);
+	printf("vbd_get_disks()\n");
+	rc = vbd_get_disks(fdisk->vbd, &svcs, &count);
+	printf(" -> %d\n", rc);
 	if (rc != EOK) {
 		rc = EIO;
@@ -363,5 +365,5 @@
 int fdisk_dev_open(fdisk_t *fdisk, service_id_t sid, fdisk_dev_t **rdev)
 {
-	vol_disk_info_t vinfo;
+	vbd_disk_info_t vinfo;
 	fdisk_dev_t *dev = NULL;
 	service_id_t *psids = NULL;
@@ -380,5 +382,5 @@
 	list_initialize(&dev->log_ba);
 
-	rc = vol_disk_info(fdisk->vol, sid, &vinfo);
+	rc = vbd_disk_info(fdisk->vbd, sid, &vinfo);
 	if (rc != EOK) {
 		rc = EIO;
@@ -386,8 +388,5 @@
 	}
 
-	dev->dcnt = vinfo.dcnt;
-
-	if (dev->dcnt != dc_label)
-		goto done;
+	dev->dcnt = dc_label;
 
 	printf("get label info\n");
@@ -421,5 +420,4 @@
 
 	free(psids);
-done:
 	*rdev = dev;
 	return EOK;
@@ -479,8 +477,8 @@
 int fdisk_label_get_info(fdisk_dev_t *dev, fdisk_label_info_t *info)
 {
-	vol_disk_info_t vinfo;
-	int rc;
-
-	rc = vol_disk_info(dev->fdisk->vol, dev->sid, &vinfo);
+	vbd_disk_info_t vinfo;
+	int rc;
+
+	rc = vbd_disk_info(dev->fdisk->vbd, dev->sid, &vinfo);
 	if (rc != EOK) {
 		rc = EIO;
@@ -488,5 +486,5 @@
 	}
 
-	info->dcnt = vinfo.dcnt;
+	info->dcnt = dc_label;
 	info->ltype = vinfo.ltype;
 	info->flags = vinfo.flags;
@@ -500,5 +498,5 @@
 	int rc;
 
-	rc = vol_label_create(dev->fdisk->vol, dev->sid, ltype);
+	rc = vbd_label_create(dev->fdisk->vbd, dev->sid, ltype);
 	if (rc != EOK)
 		return rc;
@@ -518,9 +516,11 @@
 	part = fdisk_part_first(dev);
 	while (part != NULL) {
-		(void) fdisk_part_destroy(part); /* XXX */
+		rc = fdisk_part_destroy(part);
+		if (rc != EOK)
+			return EIO;
 		part = fdisk_part_first(dev);
 	}
 
-	rc = vol_disk_empty(dev->fdisk->vol, dev->sid);
+	rc = vbd_label_delete(dev->fdisk->vbd, dev->sid);
 	if (rc != EOK)
 		return EIO;
@@ -685,4 +685,7 @@
 	sltype = NULL;
 	switch (ltype) {
+	case lt_none:
+		sltype = "None";
+		break;
 	case lt_mbr:
 		sltype = "MBR";