Changeset 99c23405 in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2015-07-04T15:18:06Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

603c1d1f

Parents:

6bc542b

Message:

Persistent partition table modification when creating or deleting partition.

File:

• uspace/srv/bd/vbd/disk.c (modified) (6 diffs)

uspace/srv/bd/vbd/disk.c

@@ -112 +112 @@
 }
 
+/** Add partition to our inventory based on liblabel partition structure */
 static int vbds_part_add(vbds_disk_t *disk, label_part_t *lpart,
     vbds_part_t **rpart)
@@ -119 +120 @@
         label_part_info_t lpinfo;
         char *name;
-        int pno;
         int rc;
 
@@ -132 +132 @@
 
         /* XXX Proper service name */
-        pno = list_count(&disk->parts);
-        rc = asprintf(&name, "%sp%u", disk->svc_name, pno);
+        rc = asprintf(&name, "%sp%u", disk->svc_name, lpart->index);
         if (rc < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
@@ -166 +165 @@
         if (rpart != NULL)
                 *rpart = part;
+        return EOK;
+}
+
+/** Remove partition from our inventory leaving only the underlying liblabel
+ * partition structure.
+ */
+static int vbds_part_remove(vbds_part_t *part, label_part_t **rlpart)
+{
+        label_part_t *lpart;
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_part_remove(%p)", part);
+
+        lpart = part->lpart;
+
+        if (part->open_cnt > 0)
+                return EBUSY;
+
+        rc = loc_service_unregister((service_id_t)part->id);
+        if (rc != EOK)
+                return EIO;
+
+        list_remove(&part->ldisk);
+        list_remove(&part->lparts);
+        free(part);
+
+        if (rlpart != NULL)
+                *rlpart = lpart;
         return EOK;
 }
@@ -442 +469 @@
 {
         vbds_part_t *part;
+        vbds_disk_t *disk;
+        label_part_t *lpart;
         int rc;
 
@@ -448 +477 @@
                 return rc;
 
-        rc = label_part_destroy(part->lpart);
-        if (rc != EOK)
-                return rc;
-
-        list_remove(&part->ldisk);
-        list_remove(&part->lparts);
-        free(part);
+        disk = part->disk;
+
+        rc = vbds_part_remove(part, &lpart);
+        if (rc != EOK)
+                return rc;
+
+        rc = label_part_destroy(lpart);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed deleting partition");
+
+                /* Try rolling back */
+                rc = vbds_part_add(disk, lpart, NULL);
+                if (rc != EOK)
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed rolling back.");
+
+                return EIO;
+        }
+
         return EOK;
 }