Changeset f63a0073 in mainline

Timestamp:

2015-11-17T10:23:24Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

363a504

Parents:

ed9bf14

Message:

Fix dummy partition handling when label creation fails.

Location:

uspace

Files:

• lib/fdisk/src/fdisk.c (modified) (2 diffs)
• srv/bd/vbd/disk.c (modified) (2 diffs)

uspace/lib/fdisk/src/fdisk.c

@@ -40 +40 @@
 #include <loc.h>
 #include <mem.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
@@ -634 +633 @@
 
         rc = vbd_label_create(dev->fdisk->vbd, dev->sid, ltype);
-        if (rc != EOK)
+        if (rc != EOK) {
+                /* Re-add dummy partition */
+                (void) fdisk_dev_add_parts(dev);
                 return rc;
+        }
 
         rc = fdisk_update_dev_info(dev);

uspace/srv/bd/vbd/disk.c

@@ -538 +538 @@
         label_info_t linfo;
         vbds_disk_t *disk;
-        int rc;
+        int rc, rc2;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_create(%zu)", sid);
@@ -583 +583 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_create(%zu) - failure", sid);
         if (disk->label == NULL) {
-                rc = label_open(sid, &label);
-                if (rc != EOK) {
+                rc2 = label_open(sid, &label);
+                if (rc2 != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to open label in disk %s.",
                             disk->svc_name);
+                        return rc2;
                 }
+
+                disk->label = label;
+                (void) vbds_disk_parts_add(disk, label);
         }