Changeset 6a0db524 in mainline

Timestamp:

2015-10-09T22:18:34Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4b6635a7

Parents:

3a43785

Message:

More checks.

File:

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

uspace/srv/bd/vbd/disk.c

@@ -490 +490 @@
 
         rc = label_get_info(disk->label, &linfo);
+        if (rc != EOK)
+                return rc;
 
         info->ltype = linfo.ltype;
@@ -534 +536 @@
 {
         label_t *label;
+        label_info_t linfo;
         vbds_disk_t *disk;
         int rc;
@@ -545 +548 @@
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_label_create(%zu) - label_close", sid);
+
+        /* Verify that current label is a dummy label */
+        rc = label_get_info(disk->label, &linfo);
+        if (rc != EOK)
+                return rc;
+
+        if (linfo.ltype != lt_none) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Label already exists.");
+                return EEXIST;
+        }
 
         /* Close dummy label first */