Changeset 64ffd83 in mainline for uspace/srv/volsrv/part.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/part.c (modified) (12 diffs)

uspace/srv/volsrv/part.c

@@ -45 +45 @@
 #include <str_error.h>
 #include <vfs/vfs.h>
+#include <vol.h>
 
 #include "empty.h"
@@ -50 +51 @@
 #include "part.h"
 #include "types/part.h"
+#include "volume.h"
 
 static errno_t vol_part_add_locked(vol_parts_t *, service_id_t);
@@ -191 +193 @@
                 return;
 
+        if (part->volume != NULL)
+                vol_volume_del_ref(part->volume);
+
         free(part->cur_mp);
         free(part->svc_name);
@@ -202 +207 @@
         struct fsname_type *fst;
         char *label;
+        vol_volume_t *volume;
         errno_t rc;
 
@@ -250 +256 @@
         }
 
+        /* Look up new or existing volume. */
+        rc = vol_volume_lookup_ref(part->parts->volumes, part->label, &volume);
+        if (rc != EOK)
+                goto error;
+
+        part->volume = volume;
         return EOK;
 
@@ -275 +287 @@
 }
 
+/** Determine the default mount point for a partition.
+ *
+ * @param part Partition
+ * @return Pointer to the constant string "Auto" or "None"
+ */
+static const char *vol_part_def_mountp(vol_part_t *part)
+{
+        return vol_part_allow_mount_by_def(part) ? "Auto" : "None";
+}
+
+/** Mount partition.
+ *
+ * @param part Partition
+ */
 static errno_t vol_part_mount(vol_part_t *part)
 {
+        const char *cfg_mp;
         char *mp;
         int err;
-        errno_t rc;
-
-        if (str_size(part->label) < 1) {
-                /* Don't mount nameless volumes */
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting nameless partition.");
+        bool mp_auto;
+        errno_t rc;
+
+        /* Get configured mount point */
+        if (str_size(part->volume->mountp) > 0) {
+                cfg_mp = part->volume->mountp;
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Configured mount point '%s",
+                    cfg_mp);
+        } else {
+                cfg_mp = vol_part_def_mountp(part);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Default mount point '%s",
+                    cfg_mp);
+        }
+
+        if (str_cmp(cfg_mp, "Auto") == 0 || str_cmp(cfg_mp, "auto") == 0) {
+
+                if (str_size(part->label) < 1) {
+                        /* Don't mount nameless volumes */
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting nameless volume.");
+                        return EOK;
+                }
+
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Determine MP label='%s'", part->label);
+                err = asprintf(&mp, "/vol/%s", part->label);
+                if (err < 0) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory");
+                        return ENOMEM;
+                }
+
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Create mount point '%s'", mp);
+                rc = vfs_link_path(mp, KIND_DIRECTORY, NULL);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating mount point '%s'",
+                            mp);
+                        free(mp);
+                        return EIO;
+                }
+
+                mp_auto = true;
+        } else if (str_cmp(cfg_mp, "None") == 0 || str_cmp(cfg_mp, "none") == 0) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting volume.");
                 return EOK;
-        }
-
-        if (!vol_part_allow_mount_by_def(part)) {
-                /* Don't mount partition by default */
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting per default policy.");
-                return EOK;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Determine MP label='%s'", part->label);
-        err = asprintf(&mp, "/vol/%s", part->label);
-        if (err < 0) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory");
-                return ENOMEM;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Create mount point '%s'", mp);
-        rc = vfs_link_path(mp, KIND_DIRECTORY, NULL);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating mount point '%s'",
-                    mp);
-                free(mp);
-                return EIO;
+        } else {
+                mp = str_dup(cfg_mp);
+                mp_auto = false;
         }
 
@@ -319 +363 @@
 
         part->cur_mp = mp;
-        part->cur_mp_auto = true;
+        part->cur_mp_auto = mp_auto;
 
         return rc;
@@ -385 +429 @@
 }
 
-errno_t vol_part_add(vol_parts_t *parts, service_id_t sid)
+errno_t vol_part_add_part(vol_parts_t *parts, service_id_t sid)
 {
         errno_t rc;
@@ -403 +447 @@
 }
 
-errno_t vol_parts_create(vol_parts_t **rparts)
+errno_t vol_parts_create(vol_volumes_t *volumes, vol_parts_t **rparts)
 {
         vol_parts_t *parts;
@@ -413 +457 @@
         fibril_mutex_initialize(&parts->lock);
         list_initialize(&parts->parts);
+        parts->volumes = volumes;
 
         *rparts = parts;
@@ -557 +602 @@
 }
 
+/** Set mount point.
+ *
+ * Verify and set a mount point. If the value of the mount point is
+ * the same as the default value, we will actually unset the mount point
+ * value (therefore effectively changing it to use the default).
+ *
+ * @return EOK on success, error code otherwise
+ */
+static errno_t vol_part_mountp_set(vol_part_t *part, const char *mountp)
+{
+        errno_t rc;
+        const char *def_mp;
+        const char *mp;
+
+        rc = vol_mountp_validate(mountp);
+        if (rc != EOK)
+                return rc;
+
+        def_mp = vol_part_def_mountp(part);
+
+        /* If the value is the same as default, set to empty string. */
+        if (str_cmp(def_mp, mountp) == 0)
+                mp = "";
+        else
+                mp = mountp;
+
+        rc = vol_volume_set_mountp(part->volume, mp);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 errno_t vol_part_mkfs_part(vol_part_t *part, vol_fstype_t fstype,
-    const char *label)
+    const char *label, const char *mountp)
 {
         errno_t rc;
@@ -585 +663 @@
         }
 
+        rc = vol_part_mountp_set(part, mountp);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&part->parts->lock);
+                return rc;
+        }
+
         rc = vol_part_mount(part);
         if (rc != EOK) {