Changeset d2c8533 in mainline for uspace/srv/volsrv/part.c

Timestamp:

2017-05-08T20:38:47Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f066a87

Parents:

582a0b8

Message:

File system probing groundwork. Only MFS can do it for now.

File:

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

uspace/srv/volsrv/part.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
+#include <vfs/vfs.h>
 
 #include "empty.h"
@@ -132 +133 @@
         vol_part_t *part;
         bool empty;
+        vfs_fs_probe_info_t info;
         int rc;
 
@@ -154 +156 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Probe partition %s", part->svc_name);
-        rc = volsrv_part_is_empty(sid, &empty);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed determining if "
-                    "partition is empty.");
-                goto error;
-        }
-
-        part->pcnt = empty ? vpc_empty : vpc_unknown;
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Probe partition %s", part->svc_name);
+        rc = vfs_fsprobe("mfs", sid, &info);
+        if (rc == EOK) {
+                part->pcnt = vpc_fs;
+                part->fstype = fs_minix;
+        } else {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Partition does not contain "
+                    "a recognized file system.");
+
+                rc = volsrv_part_is_empty(sid, &empty);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed determining if "
+                            "partition is empty.");
+                        goto error;
+                }
+
+                part->pcnt = empty ? vpc_empty : vpc_unknown;
+        }
+
         list_append(&part->lparts, &vol_parts);