Changeset 395df52 in mainline for uspace/srv/volsrv/part.c

Timestamp:

2017-05-12T19:58:27Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e48947e

Parents:

de5b708

Message:

Probing for ExFAT, Ext4 and CDFS.

File:

• uspace/srv/volsrv/part.c (modified) (3 diffs)

uspace/srv/volsrv/part.c

@@ -53 +53 @@
 static FIBRIL_MUTEX_INITIALIZE(vol_parts_lock);
 
+struct fsname_type {
+        const char *name;
+        vol_fstype_t fstype;
+};
+
+static struct fsname_type fstab[] = {
+        { "ext4fs", fs_ext4 },
+        { "cdfs", fs_cdfs },
+        { "exfat", fs_exfat },
+        { "fat", fs_fat },
+        { "mfs", fs_minix },
+        { NULL, 0 }
+};
+
 /** Check for new partitions */
 static int vol_part_check_new(void)
@@ -134 +148 @@
         bool empty;
         vfs_fs_probe_info_t info;
+        struct fsname_type *fst;
         int rc;
 
@@ -157 +172 @@
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "Probe partition %s", part->svc_name);
-        rc = vfs_fsprobe("mfs", sid, &info);
-        if (rc == EOK) {
+
+        fst = &fstab[0];
+        while (fst->name != NULL) {
+                rc = vfs_fsprobe(fst->name, sid, &info);
+                if (rc == EOK)
+                        break;
+                ++fst;
+        }
+
+        if (fst->name != NULL) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Found %s", fst->name);
                 part->pcnt = vpc_fs;
-                part->fstype = fs_minix;
+                part->fstype = fst->fstype;
         } else {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Partition does not contain "