Changeset 4b6635a7 in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2015-10-12T15:42:23Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

edebb4a1

Parents:

6a0db524

Message:

Volsrv empty partition detection.

File:

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

uspace/lib/fdisk/src/fdisk.c

@@ -261 +261 @@
         fdisk_part_t *part;
         vbd_part_info_t pinfo;
+        vol_part_info_t vpinfo;
         int rc;
 
@@ -268 +269 @@
 
         rc = vbd_part_get_info(dev->fdisk->vbd, partid, &pinfo);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
+        rc = vol_part_info(dev->fdisk->vol, pinfo.svc_id, &vpinfo);
         if (rc != EOK) {
                 rc = EIO;
@@ -278 +285 @@
         part->nblocks = pinfo.nblocks;
         part->pkind = pinfo.pkind;
+        part->svc_id = pinfo.svc_id;
+        part->pcnt = vpinfo.pcnt;
+        part->fstype = vpinfo.fstype;
 
         switch (part->pkind) {
@@ -551 +561 @@
 {
         info->capacity = part->capacity;
+        info->pcnt = part->pcnt;
         info->fstype = part->fstype;
         info->pkind = part->pkind;
@@ -589 +600 @@
 
         printf("fdisk_part_create() - done\n");
+        part->pcnt = vpc_fs;
         part->fstype = pspec->fstype;
         part->capacity = pspec->capacity;
@@ -700 +712 @@
 }
 
-int fdisk_fstype_format(fdisk_fstype_t fstype, char **rstr)
+int fdisk_fstype_format(vol_fstype_t fstype, char **rstr)
 {
         const char *sfstype;
@@ -707 +719 @@
         sfstype = NULL;
         switch (fstype) {
-        case fdfs_none:
-                sfstype = "None";
-                break;
-        case fdfs_unknown:
-                sfstype = "Unknown";
-                break;
-        case fdfs_exfat:
+        case fs_exfat:
                 sfstype = "ExFAT";
                 break;
-        case fdfs_fat:
+        case fs_fat:
                 sfstype = "FAT";
                 break;
-        case fdfs_minix:
+        case fs_minix:
                 sfstype = "MINIX";
                 break;
-        case fdfs_ext4:
+        case fs_ext4:
                 sfstype = "Ext4";
                 break;
@@ -916 +922 @@
         int rc;
 
-//      pspec->fstype
         printf("fdisk_part_spec_prepare() - dev=%p pspec=%p vpspec=%p\n", dev, pspec,
             vpspec);
@@ -935 +940 @@
 
         switch (pspec->fstype) {
-        case fdfs_none:
-        case fdfs_unknown:
-                break;
-        case fdfs_exfat:
+        case fs_exfat:
                 pcnt = lpc_exfat;
                 break;
-        case fdfs_fat:
+        case fs_fat:
                 pcnt = lpc_fat32; /* XXX Detect FAT12/16 vs FAT32 */
                 break;
-        case fdfs_minix:
+        case fs_minix:
                 pcnt = lpc_minix;
                 break;
-        case fdfs_ext4:
+        case fs_ext4:
                 pcnt = lpc_ext4;
                 break;