Changeset 9c2c7d2 in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2017-07-06T15:52:15Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5cd1eb9a

Parents:

d858a660

Message:

Fdisk should be able to set volume label for newly created partitions.

File:

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

uspace/lib/fdisk/src/fdisk.c

@@ -731 +731 @@
     fdisk_part_t **rpart)
 {
-        fdisk_part_t *part;
+        fdisk_part_t *part = NULL;
         vbd_part_spec_t vpspec;
-        vbd_part_id_t partid;
-        int rc;
+        vbd_part_id_t partid = 0;
+        vol_part_info_t vpinfo;
+        char *label;
+        int rc;
+
+        label = str_dup(pspec->label);
+        if (label == NULL)
+                return ENOMEM;
 
         rc = fdisk_part_spec_prepare(dev, pspec, &vpspec);
-        if (rc != EOK)
-                return EIO;
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
 
         rc = vbd_part_create(dev->fdisk->vbd, dev->sid, &vpspec, &partid);
-        if (rc != EOK)
-                return EIO;
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
 
         rc = fdisk_part_add(dev, partid, &part);
         if (rc != EOK) {
-                /* Try rolling back */
-                (void) vbd_part_delete(dev->fdisk->vbd, partid);
-                return EIO;
+                rc = EIO;
+                goto error;
         }
 
         if (part->svc_id != 0) {
-                rc = vol_part_mkfs(dev->fdisk->vol, part->svc_id, pspec->fstype);
+                rc = vol_part_mkfs(dev->fdisk->vol, part->svc_id, pspec->fstype,
+                    pspec->label);
                 if (rc != EOK && rc != ENOTSUP) {
-                        fdisk_part_remove(part);
-                        (void) vbd_part_delete(dev->fdisk->vbd, partid);
-                        return EIO;
-                }
-
-                part->pcnt = vpc_fs;
-                part->fstype = pspec->fstype;
+                        rc = EIO;
+                        goto error;
+                }
+
+                /* Get the real label value */
+                rc = vol_part_info(dev->fdisk->vol, part->svc_id, &vpinfo);
+                if (rc != EOK) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                part->pcnt = vpinfo.pcnt;
+                part->fstype = vpinfo.fstype;
+                part->label = str_dup(vpinfo.label);
+
+                if (part->label == NULL) {
+                        rc = EIO;
+                        goto error;
+                }
         }
 
@@ -766 +788 @@
                 *rpart = part;
         return EOK;
+error:
+        /* Try rolling back */
+        if (part != NULL)
+                fdisk_part_remove(part);
+        if (partid != 0)
+                (void) vbd_part_delete(dev->fdisk->vbd, partid);
+        return rc;
 }
 
@@ -1194 +1223 @@
 }
 
+/** Get volume label support. */
+int fdisk_get_vollabel_support(fdisk_dev_t *dev, vol_fstype_t fstype,
+    vol_label_supp_t *vlsupp)
+{
+        return vol_part_get_lsupp(dev->fdisk->vol, fstype, vlsupp);
+}
+
 /** @}
  */