Changeset 372df8f in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2015-10-09T07:00:23Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0ecfc62

Parents:

0bde8523

Message:

Let VBD handle unlabeled devices too. Now volsrv only cares about partitions.

File:

• uspace/lib/fdisk/src/fdisk.c (modified) (10 diffs)

uspace/lib/fdisk/src/fdisk.c

@@ -133 +133 @@
         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 +365 @@
 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 +382 @@
         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 +388 @@
         }
 
-        dev->dcnt = vinfo.dcnt;
-
-        if (dev->dcnt != dc_label)
-                goto done;
+        dev->dcnt = dc_label;
 
         printf("get label info\n");
@@ -421 +420 @@
 
         free(psids);
-done:
         *rdev = dev;
         return EOK;
@@ -479 +477 @@
 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 +486 @@
         }
 
-        info->dcnt = vinfo.dcnt;
+        info->dcnt = dc_label;
         info->ltype = vinfo.ltype;
         info->flags = vinfo.flags;
@@ -500 +498 @@
         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 +516 @@
         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 +685 @@
         sltype = NULL;
         switch (ltype) {
+        case lt_none:
+                sltype = "None";
+                break;
         case lt_mbr:
                 sltype = "MBR";