Changes in uspace/lib/fdisk/src/fdisk.c [fe8961d:395df52] 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>
@@ -219 +218 @@
 }
 
-int fdisk_dev_info_capacity(fdisk_dev_info_t *info, cap_spec_t *cap)
+int fdisk_dev_info_capacity(fdisk_dev_info_t *info, fdisk_cap_t *cap)
 {
         vbd_disk_info_t vinfo;
@@ -228 +227 @@
                 return EIO;
 
-        cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
+        fdisk_cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
         return EOK;
 }
@@ -270 +269 @@
                 part->pcnt = vpinfo.pcnt;
                 part->fstype = vpinfo.fstype;
-                part->label = str_dup(vpinfo.label);
         }
 
@@ -295 +293 @@
                 dev->ext_part = part;
 
-        cap_from_blocks(part->nblocks, dev->dinfo.block_size,
+        fdisk_cap_from_blocks(part->nblocks, dev->dinfo.block_size,
             &part->capacity);
         part->part_id = partid;
@@ -303 +301 @@
         return EOK;
 error:
-        if (part != NULL)
-                free(part->label);
         free(part);
         return rc;
@@ -319 +315 @@
         if (link_used(&part->llog_ba))
                 list_remove(&part->llog_ba);
-
-        free(part->label);
         free(part);
 }
@@ -536 +530 @@
 }
 
-int fdisk_dev_capacity(fdisk_dev_t *dev, cap_spec_t *cap)
-{
-        cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
+int fdisk_dev_capacity(fdisk_dev_t *dev, fdisk_cap_t *cap)
+{
+        fdisk_cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -673 +667 @@
         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, cap_spec_t *cap)
+int fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc, fdisk_cap_t *cap)
 {
         int rc;
@@ -697 +690 @@
         }
 
-        cap_from_blocks(nb, dev->dinfo.block_size, cap);
+        fdisk_cap_from_blocks(nb, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -703 +696 @@
 /** Get total free space capacity. */
 int fdisk_part_get_tot_avail(fdisk_dev_t *dev, fdisk_spc_t spc,
-    cap_spec_t *cap)
+    fdisk_cap_t *cap)
 {
         fdisk_free_range_t fr;
@@ -725 +718 @@
         } while (fdisk_free_range_next(&fr));
 
-        cap_from_blocks(totb, dev->dinfo.block_size, cap);
+        fdisk_cap_from_blocks(totb, dev->dinfo.block_size, cap);
         return EOK;
 }
@@ -732 +725 @@
     fdisk_part_t **rpart)
 {
-        fdisk_part_t *part = NULL;
+        fdisk_part_t *part;
         vbd_part_spec_t vpspec;
-        vbd_part_id_t partid = 0;
-        vol_part_info_t vpinfo;
-        const char *label;
-        int rc;
-
-        label = pspec->label != NULL ? pspec->label : "";
+        vbd_part_id_t partid;
+        int rc;
 
         rc = fdisk_part_spec_prepare(dev, pspec, &vpspec);
-        if (rc != EOK) {
-                rc = EIO;
-                goto error;
-        }
+        if (rc != EOK)
+                return EIO;
 
         rc = vbd_part_create(dev->fdisk->vbd, dev->sid, &vpspec, &partid);
-        if (rc != EOK) {
-                rc = EIO;
-                goto error;
-        }
+        if (rc != EOK)
+                return EIO;
 
         rc = fdisk_part_add(dev, partid, &part);
         if (rc != EOK) {
-                rc = EIO;
-                goto error;
+                /* Try rolling back */
+                (void) vbd_part_delete(dev->fdisk->vbd, partid);
+                return EIO;
         }
 
         if (part->svc_id != 0) {
-                rc = vol_part_mkfs(dev->fdisk->vol, part->svc_id, pspec->fstype,
-                    label);
+                rc = vol_part_mkfs(dev->fdisk->vol, part->svc_id, pspec->fstype);
                 if (rc != EOK && rc != ENOTSUP) {
-                        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;
-                }
+                        fdisk_part_remove(part);
+                        (void) vbd_part_delete(dev->fdisk->vbd, partid);
+                        return EIO;
+                }
+
+                part->pcnt = vpc_fs;
+                part->fstype = pspec->fstype;
         }
 
@@ -787 +760 @@
                 *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;
 }
 
@@ -996 +962 @@
         int rc;
 
-        rc = cap_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
+        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_nom, dev->dinfo.block_size,
             &nom_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = cap_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
+        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_min, dev->dinfo.block_size,
             &min_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = cap_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
+        rc = fdisk_cap_to_blocks(&pspec->capacity, fcv_max, dev->dinfo.block_size,
             &max_blocks);
         if (rc != EOK)
@@ -1015 +981 @@
         max_blocks = fdisk_ba_align_up(dev, max_blocks);
 
-        pcnt = LPC_LIMIT;
+        pcnt = -1;
 
         switch (pspec->fstype) {
@@ -1034 +1000 @@
         }
 
-        if (pcnt == LPC_LIMIT)
+        if (pcnt < 0)
                 return EINVAL;
 
@@ -1222 +1188 @@
 }
 
-/** 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);
-}
-
 /** @}
  */