Changeset 603c1d1f in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2015-07-05T18:53:00Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bf7ddde

Parents:

99c23405

Message:

Persistent partition table creation and destruction.

File:

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

uspace/lib/fdisk/src/fdisk.c

@@ -317 +317 @@
 int fdisk_dev_open(fdisk_t *fdisk, service_id_t sid, fdisk_dev_t **rdev)
 {
+        vol_disk_info_t vinfo;
         fdisk_dev_t *dev = NULL;
         service_id_t *psids = NULL;
@@ -331 +332 @@
         list_initialize(&dev->parts_ba);
 
-        printf("get info\n");
+        rc = vol_disk_info(fdisk->vol, sid, &vinfo);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
+        dev->dcnt = vinfo.dcnt;
+
+        if (dev->dcnt != dc_label)
+                goto done;
+
+        printf("get label info\n");
         rc = vbd_disk_info(fdisk->vbd, sid, &dev->dinfo);
         if (rc != EOK) {
@@ -361 +373 @@
 
         free(psids);
+done:
         *rdev = dev;
         return EOK;