Changes in uspace/lib/fdisk/src/fdisk.c [395df52:fe8961d] in mainline

File:

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

uspace/lib/fdisk/src/fdisk.c

@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <cap.h>
 #include <errno.h>
 #include <fdisk.h>
@@ -218 +219 @@
 }
 
-int fdisk_dev_info_capacity(fdisk_dev_info_t *info, fdisk_cap_t *cap)
+int fdisk_dev_info_capacity(fdisk_dev_info_t *info, cap_spec_t *cap)
 {
         vbd_disk_info_t vinfo;
@@ -227 +228 @@
                 return EIO;
 
-        fdisk_cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
+        cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
         return EOK;
 }
@@ -269 +270 @@
                 part->pcnt = vpinfo.pcnt;
                 part->fstype = vpinfo.fstype;
+                part->label = str_dup(vpinfo.label);
         }
 
@@ -293 +295 @@
                 dev->ext_part = part;
 
-        fdisk_cap_from_blocks(part->nblocks, dev->dinfo.block_size,
+        cap_from_blocks(part->nblocks, dev->dinfo.block_size,
             &part->capacity);
         part->part_id = partid;
@@ -301 +303 @@
         return EOK;
 error:
+        if (part != NULL)
+                free(part->label);
         free(part);
         return rc;
@@ -315 +319 @@
         if (link_used(&part->llog_ba))
                 list_remove(&part->llog_ba);
+
+        free(part->label);
         free(part);
 }
@@ -530 +536 @@
 }
 
-int fdisk_dev_capacity(fdisk_dev_t *dev, fdisk_cap_t *cap)
-{
-        fdisk_cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
+int fdisk_dev_capacity(fdisk_dev_t *dev, cap_spec_t *cap)
+{
+        cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -667 +673 @@
         info->fstype = part->fstype;
         info->pkind = part->pkind;
+        info->label = part->label;
         return EOK;
 }
 
 /** Get size of largest free block. */
-int fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc, fdisk_cap_t *cap)
+int fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc, cap_spec_t *cap)
 {
         int rc;
@@ -690 +697 @@
         }
 
-        fdisk_cap_from_blocks(nb, dev->dinfo.block_size, cap);
+        cap_from_blocks(nb, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -696 +703 @@
 /** Get total free space capacity. */
 int fdisk_part_get_tot_avail(fdisk_dev_t *dev, fdisk_spc_t spc,
-    fdisk_cap_t *cap)
+    cap_spec_t *cap)
 {
         fdisk_free_range_t fr;
@@ -718 +725 @@
         } while (fdisk_free_range_next(&fr));
 
-        fdisk_cap_from_blocks(totb, dev->dinfo.block_size, cap);
+        cap_from_blocks(totb, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -725 +732 @@
     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;
+        const char *label;
+        int rc;
+
+        label = pspec->label != NULL ? pspec->label : "";
 
         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,
+                    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;
+                }
         }
 
@@ -760 +787 @@
                 *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;
 }
 
@@ -962 +996 @@
         int rc;
 
-        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_nom, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
             &nom_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_min, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
             &min_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_max, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
             &max_blocks);
         if (rc != EOK)
@@ -981 +1015 @@
         max_blocks = fdisk_ba_align_up(dev, max_blocks);
 
-        pcnt = -1;
+        pcnt = LPC_LIMIT;
 
         switch (pspec->fstype) {
@@ -1000 +1034 @@
         }
 
-        if (pcnt < 0)
+        if (pcnt == LPC_LIMIT)
                 return EINVAL;
 
@@ -1188 +1222 @@
 }
 
+/** 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);
+}
+
 /** @}
  */