Changeset 64ffd83 in mainline for uspace/srv/volsrv/volsrv.c

Timestamp:

2018-07-24T09:43:38Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bec18a9

Parents:

05208d9

git-author:

Jiri Svoboda <jiri@…> (2018-07-23 18:41:45)

git-committer:

Jiri Svoboda <jiri@…> (2018-07-24 09:43:38)

Message:

Configuring mount point for (newly created) paritions.

File:

• uspace/srv/volsrv/volsrv.c (modified) (7 diffs)

uspace/srv/volsrv/volsrv.c

@@ -49 +49 @@
 #include "mkfs.h"
 #include "part.h"
+#include "volume.h"
 
 #define NAME  "volsrv"
@@ -57 +58 @@
 {
         errno_t rc;
+        vol_volumes_t *volumes = NULL;
         vol_parts_t *parts = NULL;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
 
-        rc = vol_parts_create(&parts);
+        rc = vol_volumes_create(&volumes);
+        if (rc != EOK)
+                goto error;
+
+        rc = vol_parts_create(volumes, &parts);
         if (rc != EOK)
                 goto error;
@@ -87 +93 @@
         return EOK;
 error:
+        vol_volumes_destroy(volumes);
         vol_parts_destroy(parts);
         return rc;
@@ -131 +138 @@
         sid = IPC_GET_ARG1(*icall);
 
-        rc = vol_part_add(parts, sid);
+        rc = vol_part_add_part(parts, sid);
         if (rc != EOK) {
                 async_answer_0(icall, rc);
@@ -285 +292 @@
         vol_fstype_t fstype;
         char *label;
+        char *mountp;
         errno_t rc;
 
@@ -304 +312 @@
         }
 
+        rc = async_data_write_accept((void **)&mountp, true, 0, VOL_MOUNTP_MAXLEN,
+            0, NULL);
+        if (rc != EOK) {
+                free(label);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        if (mountp != NULL) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv: mountp='%s'",
+                    mountp);
+        }
+
         rc = vol_part_find_by_id_ref(parts, sid, &part);
         if (rc != EOK) {
@@ -311 +332 @@
         }
 
-        rc = vol_part_mkfs_part(part, fstype, label);
+        rc = vol_part_mkfs_part(part, fstype, label, mountp);
         if (rc != EOK) {
                 free(label);