Changeset edebb4a1 in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2015-10-14T22:30:12Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ea0ff6b

Parents:

4b6635a7

Message:

Handle dummy partition addition/removal during label destruction/creation. Handle dummy label properly in fdisk.

File:

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

uspace/lib/fdisk/src/fdisk.c

@@ -58 +58 @@
 };
 
+static int fdisk_dev_add_parts(fdisk_dev_t *);
+static void fdisk_dev_remove_parts(fdisk_dev_t *);
 static int fdisk_part_spec_prepare(fdisk_dev_t *, fdisk_part_spec_t *,
     vbd_part_spec_t *);
@@ -256 +258 @@
 }
 
+/** Add partition to our inventory. */
 static int fdisk_part_add(fdisk_dev_t *dev, vbd_part_id_t partid,
     fdisk_part_t **rpart)
@@ -268 +271 @@
                 return ENOMEM;
 
+        printf("vbd_part_get_info(%zu)\n", partid);
         rc = vbd_part_get_info(dev->fdisk->vbd, partid, &pinfo);
         if (rc != EOK) {
@@ -274 +278 @@
         }
 
+        printf("vol_part_add(%zu)...\n", pinfo.svc_id);
+        /*
+         * Normally vol service discovers the partition asynchronously.
+         * Here we need to make sure the partition is already known to it.
+         */
+        rc = vol_part_add(dev->fdisk->vol, pinfo.svc_id);
+        printf("vol_part_add->rc = %d\n", rc);
+        if (rc != EOK && rc != EEXIST) {
+                rc = EIO;
+                goto error;
+        }
+
+        printf("vol_part_info(%zu)\n", pinfo.svc_id);
         rc = vol_part_info(dev->fdisk->vol, pinfo.svc_id, &vpinfo);
+        printf("vol_part_info->rc = %d\n", rc);
         if (rc != EOK) {
                 rc = EIO;
@@ -316 +334 @@
 }
 
+/** Remove partition from our inventory. */
+static void fdisk_part_remove(fdisk_part_t *part)
+{
+        list_remove(&part->lparts);
+        if (link_used(&part->lpri_ba))
+                list_remove(&part->lpri_ba);
+        if (link_used(&part->lpri_idx))
+                list_remove(&part->lpri_idx);
+        if (link_used(&part->llog_ba))
+                list_remove(&part->llog_ba);
+        free(part);
+}
+
 static void fdisk_pri_part_insert_lists(fdisk_dev_t *dev, fdisk_part_t *part)
 {
@@ -373 +404 @@
 }
 
-int fdisk_dev_open(fdisk_t *fdisk, service_id_t sid, fdisk_dev_t **rdev)
-{
-        vbd_disk_info_t vinfo;
-        fdisk_dev_t *dev = NULL;
+static int fdisk_dev_add_parts(fdisk_dev_t *dev)
+{
         service_id_t *psids = NULL;
         size_t nparts, i;
         int rc;
-
-        dev = calloc(1, sizeof(fdisk_dev_t));
-        if (dev == NULL)
-                return ENOMEM;
-
-        dev->fdisk = fdisk;
-        dev->sid = sid;
-        list_initialize(&dev->parts);
-        list_initialize(&dev->pri_idx);
-        list_initialize(&dev->pri_ba);
-        list_initialize(&dev->log_ba);
-
-        rc = vbd_disk_info(fdisk->vbd, sid, &vinfo);
-        if (rc != EOK) {
-                rc = EIO;
-                goto error;
-        }
 
         printf("get label info\n");
@@ -408 +420 @@
         printf("block size: %zu\n", dev->dinfo.block_size);
         printf("get partitions\n");
-        rc = vbd_label_get_parts(fdisk->vbd, sid, &psids, &nparts);
+        rc = vbd_label_get_parts(dev->fdisk->vbd, dev->sid, &psids, &nparts);
         if (rc != EOK) {
                 printf("failed\n");
@@ -428 +440 @@
 
         free(psids);
+        return EOK;
+error:
+        fdisk_dev_remove_parts(dev);
+        return rc;
+}
+
+static void fdisk_dev_remove_parts(fdisk_dev_t *dev)
+{
+        fdisk_part_t *part;
+
+        part = fdisk_part_first(dev);
+        while (part != NULL) {
+                fdisk_part_remove(part);
+                part = fdisk_part_first(dev);
+        }
+}
+
+int fdisk_dev_open(fdisk_t *fdisk, service_id_t sid, fdisk_dev_t **rdev)
+{
+        vbd_disk_info_t vinfo;
+        fdisk_dev_t *dev = NULL;
+        service_id_t *psids = NULL;
+        size_t nparts, i;
+        int rc;
+
+        dev = calloc(1, sizeof(fdisk_dev_t));
+        if (dev == NULL)
+                return ENOMEM;
+
+        dev->fdisk = fdisk;
+        dev->sid = sid;
+        list_initialize(&dev->parts);
+        list_initialize(&dev->pri_idx);
+        list_initialize(&dev->pri_ba);
+        list_initialize(&dev->log_ba);
+
+        rc = vbd_disk_info(fdisk->vbd, sid, &vinfo);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
+        printf("get label info\n");
+        rc = fdisk_update_dev_info(dev);
+        if (rc != EOK) {
+                printf("failed\n");
+                rc = EIO;
+                goto error;
+        }
+
+        printf("block size: %zu\n", dev->dinfo.block_size);
+        printf("get partitions\n");
+        rc = vbd_label_get_parts(fdisk->vbd, sid, &psids, &nparts);
+        if (rc != EOK) {
+                printf("failed\n");
+                rc = EIO;
+                goto error;
+        }
+        printf("OK\n");
+
+        printf("found %zu partitions.\n", nparts);
+        for (i = 0; i < nparts; i++) {
+                printf("add partition sid=%zu\n", psids[i]);
+                rc = fdisk_part_add(dev, psids[i], NULL);
+                if (rc != EOK) {
+                        printf("failed\n");
+                        goto error;
+                }
+                printf("OK\n");
+        }
+
+        free(psids);
         *rdev = dev;
         return EOK;
@@ -440 +524 @@
                 return;
 
-        /* XXX Clean up partitions */
+        fdisk_dev_remove_parts(dev);
         free(dev);
 }
@@ -504 +588 @@
 {
         int rc;
+
+        /* Remove dummy partition */
+        fdisk_dev_remove_parts(dev);
 
         rc = vbd_label_create(dev->fdisk->vbd, dev->sid, ltype);
@@ -533 +620 @@
                 return EIO;
 
+        rc = fdisk_dev_add_parts(dev);
+        if (rc != EOK)
+                return rc;
+
         return EOK;
 }
@@ -617 +708 @@
                 return EIO;
 
-        list_remove(&part->lparts);
-        if (link_used(&part->lpri_ba))
-                list_remove(&part->lpri_ba);
-        if (link_used(&part->lpri_idx))
-                list_remove(&part->lpri_idx);
-        if (link_used(&part->llog_ba))
-                list_remove(&part->llog_ba);
-        free(part);
+        fdisk_part_remove(part);
         return EOK;
 }