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

Timestamp:

2015-10-15T20:43:30Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44fe800

Parents:

edebb4a1

Message:

Disk erasure.

File:

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

uspace/lib/fdisk/src/fdisk.c

@@ -528 +528 @@
 }
 
+/** Erase contents of unlabeled disk. */
+int fdisk_dev_erase(fdisk_dev_t *dev)
+{
+        fdisk_part_t *part;
+        int rc;
+
+        printf("fdisk_dev_erase.. check ltype\n");
+        if (dev->dinfo.ltype != lt_none)
+                return EINVAL;
+
+        printf("fdisk_dev_erase.. get first part\n");
+        part = fdisk_part_first(dev);
+        assert(part != NULL);
+        printf("fdisk_dev_erase.. check part\n");
+        if (part->pcnt == vpc_empty)
+                return EINVAL;
+
+        printf("fdisk_dev_erase.. check part\n");
+        rc = vol_part_empty(dev->fdisk->vol, part->svc_id);
+        if (rc != EOK) {
+                printf("vol_part_empty -> %d\n", rc);
+                return rc;
+        }
+
+        part->pcnt = vpc_empty;
+        return EOK;
+}
+
+void fdisk_dev_get_flags(fdisk_dev_t *dev, fdisk_dev_flags_t *rflags)
+{
+        fdisk_dev_flags_t flags;
+        fdisk_part_t *part;
+
+        flags = 0;
+
+        /* fdf_can_create_label */
+        if (dev->dinfo.ltype == lt_none) {
+                part = fdisk_part_first(dev);
+                assert(part != NULL);
+                if (part->pcnt == vpc_empty)
+                        flags |= fdf_can_create_label;
+                else
+                        flags |= fdf_can_erase_dev;
+        } else {
+                flags |= fdf_can_delete_label;
+        }
+
+        *rflags = flags;
+}
+
 int fdisk_dev_get_svcname(fdisk_dev_t *dev, char **rname)
 {
@@ -587 +637 @@
 int fdisk_label_create(fdisk_dev_t *dev, label_type_t ltype)
 {
-        int rc;
+        fdisk_part_t *part;
+        int rc;
+
+        /* Disk must not contain a label. */
+        if (dev->dinfo.ltype != lt_none)
+                return EEXIST;
+
+        /* Dummy partition spanning entire disk must be considered empty */
+        part = fdisk_part_first(dev);
+        assert(part != NULL);
+        if (part->pcnt != vpc_empty)
+                return EEXIST;
 
         /* Remove dummy partition */
@@ -606 +667 @@
 {
         fdisk_part_t *part;
-        int rc;
+        fdisk_dev_flags_t dflags;
+        int rc;
+
+        printf("fdisk_label_destroy: begin\n");
 
         part = fdisk_part_first(dev);
@@ -616 +680 @@
         }
 
+        printf("fdisk_label_destroy: vbd_label_delete\n");
+
         rc = vbd_label_delete(dev->fdisk->vbd, dev->sid);
         if (rc != EOK)
                 return EIO;
 
+        printf("fdisk_label_destroy: add parts\n");
         rc = fdisk_dev_add_parts(dev);
         if (rc != EOK)
                 return rc;
 
+        printf("fdisk_label_destroy: erase dev\n");
+        /* Make sure device is considered empty */
+        fdisk_dev_get_flags(dev, &dflags);
+        if ((dflags & fdf_can_erase_dev) != 0) {
+                rc = fdisk_dev_erase(dev);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        printf("fdisk_label_destroy: done\n");
         return EOK;
 }