Changeset b82985e in mainline

Timestamp:

2018-10-12T13:16:04Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d09eeb2

Parents:

6d00aff

Message:

Inserting volume by path.

Location:

uspace

Files:

• app/vol/vol.c (modified) (5 diffs)
• lib/c/generic/vol.c (modified) (1 diff)
• lib/c/include/ipc/vol.h (modified) (1 diff)
• lib/c/include/vol.h (modified) (1 diff)
• lib/sif/include/sif.h (modified) (1 diff)
• srv/volsrv/part.c (modified) (5 diffs)
• srv/volsrv/part.h (modified) (1 diff)
• srv/volsrv/volsrv.c (modified) (2 diffs)

uspace/app/vol/vol.c

@@ -47 +47 @@
         vcmd_eject,
         vcmd_insert,
+        vcmd_insert_by_path,
         vcmd_help,
         vcmd_list,
@@ -155 +156 @@
 
         rc = vol_part_insert(vol, svc_id);
+        if (rc != EOK) {
+                printf("Error inserting volume.\n");
+                goto out;
+        }
+
+        rc = EOK;
+out:
+        vol_destroy(vol);
+        return rc;
+}
+
+static errno_t vol_cmd_insert_by_path(const char *volspec)
+{
+        vol_t *vol = NULL;
+        errno_t rc;
+
+        rc = vol_create(&vol);
+        if (rc != EOK) {
+                printf("Error contacting volume service.\n");
+                goto out;
+        }
+
+        rc = vol_part_insert_by_path(vol, volspec);
         if (rc != EOK) {
                 printf("Error inserting volume.\n");
@@ -304 +328 @@
         printf("  %s eject <mp>     Eject volume mounted in a directory\n", NAME);
         printf("  %s insert <svc>   Insert volume based on service identifier\n", NAME);
+        printf("  %s insert -p <mp> Insert volume based on filesystem path\n", NAME);
 }
 
@@ -332 +357 @@
                         volspec = argv[i++];
                 } else if (str_cmp(cmd, "insert") == 0) {
-                        vcmd = vcmd_insert;
+                        if (str_cmp(argv[i], "-p") == 0) {
+                                vcmd = vcmd_insert_by_path;
+                                ++i;
+                        } else {
+                                vcmd = vcmd_insert;
+                        }
+
                         if (argc <= i) {
                                 printf("Parameter missing.\n");
@@ -356 +387 @@
                 rc = vol_cmd_insert(volspec);
                 break;
+        case vcmd_insert_by_path:
+                rc = vol_cmd_insert_by_path(volspec);
+                break;
         case vcmd_help:
                 print_syntax();

uspace/lib/c/generic/vol.c

@@ -312 +312 @@
 }
 
+/** Insert volume by path.
+ *
+ * @param vol Volume service
+ * @param path Filesystem path
+ *
+ * @return EOK on success or an error code
+ */
+errno_t vol_part_insert_by_path(vol_t *vol, const char *path)
+{
+        async_exch_t *exch;
+        ipc_call_t answer;
+        errno_t retval;
+
+        exch = async_exchange_begin(vol->sess);
+        aid_t req = async_send_0(exch, VOL_PART_INSERT_BY_PATH, &answer);
+
+        retval = async_data_write_start(exch, path, str_size(path));
+        if (retval != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return retval;
+        }
+
+        async_exchange_end(exch);
+        async_wait_for(req, &retval);
+
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
+}
+
 /** Get volume label support.
  *

uspace/lib/c/include/ipc/vol.h

@@ -46 +46 @@
         VOL_PART_EMPTY,
         VOL_PART_INSERT,
+        VOL_PART_INSERT_BY_PATH,
         VOL_PART_LSUPP,
         VOL_PART_MKFS,

uspace/lib/c/include/vol.h

@@ -51 +51 @@
 extern errno_t vol_part_empty(vol_t *, service_id_t);
 extern errno_t vol_part_insert(vol_t *, service_id_t);
+extern errno_t vol_part_insert_by_path(vol_t *, const char *);
 extern errno_t vol_part_get_lsupp(vol_t *, vol_fstype_t, vol_label_supp_t *);
 extern errno_t vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t, const char *,

uspace/lib/sif/include/sif.h

@@ -35 +35 @@
  */
 
-#ifndef SIF_H_
-#define SIF_H_
+#ifndef LIBSIF_SIF_H_
+#define LIBSIF_SIF_H_
 
 #include <errno.h>

uspace/srv/volsrv/part.c

@@ -297 +297 @@
 }
 
-/** Mount partition.
+/** Determine actual mount path to be used for a partition.
  *
  * @param part Partition
- */
-static errno_t vol_part_mount(vol_part_t *part)
+ * @param rpath Place to store pointer to newly allocated string or @c NULL
+ *              if volume should not be mounted
+ * @param rauto Place to store boolean flag whether mount point is automatic
+ *
+ * @return EOK on success, ENOMEM if out of memory
+ */
+static errno_t vol_part_determine_mount_path(vol_part_t *part, char **rpath,
+    bool *rauto)
 {
         const char *cfg_mp;
         char *mp;
+        bool mp_auto;
         int err;
-        bool mp_auto;
-        errno_t rc;
 
         /* Get configured mount point */
@@ -324 +329 @@
                 if (str_size(part->label) < 1) {
                         /* Don't mount nameless volumes */
-                        log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting nameless volume.");
+                        *rpath = NULL;
+                        *rauto = false;
                         return EOK;
                 }
@@ -335 +341 @@
                 }
 
+                mp_auto = true;
+        } else if (str_cmp(cfg_mp, "None") == 0 || str_cmp(cfg_mp, "none") == 0) {
+                mp = NULL;
+                mp_auto = false;
+        } else {
+                mp = str_dup(cfg_mp);
+                mp_auto = false;
+        }
+
+        *rpath = mp;
+        *rauto = mp_auto;
+        return EOK;
+}
+
+/** Mount partition.
+ *
+ * @param part Partition
+ */
+static errno_t vol_part_mount(vol_part_t *part)
+{
+        char *mp;
+        bool mp_auto;
+        errno_t rc;
+
+        rc = vol_part_determine_mount_path(part, &mp, &mp_auto);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Error determining mount point.\n");
+                return rc;
+        }
+
+        if (mp == NULL) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting volume.");
+                return EOK;
+        }
+
+        if (mp_auto) {
+                /* Create directory for automatic mount point */
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Create mount point '%s'", mp);
                 rc = vfs_link_path(mp, KIND_DIRECTORY, NULL);
@@ -343 +386 @@
                         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;
-        } else {
-                mp = str_dup(cfg_mp);
-                mp_auto = false;
         }
 
@@ -545 +580 @@
 }
 
+/** Find partition by filesystem path.
+ *
+ * @param parts Partitions
+ * @param path Filesystem path
+ * @param rpart Place to store pointer to partition
+ * @return EOK on success, ENOENT if not found, ENOMEM if out of memory
+ */
+errno_t vol_part_find_by_path_ref(vol_parts_t *parts, const char *path,
+    vol_part_t **rpart)
+{
+        errno_t rc;
+        char *mpath;
+        bool mauto;
+
+        fibril_mutex_lock(&parts->lock);
+
+        list_foreach(parts->parts, lparts, vol_part_t, part) {
+                rc = vol_part_determine_mount_path(part, &mpath, &mauto);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&parts->lock);
+                        return ENOMEM;
+                }
+
+                if (mpath != NULL && str_cmp(mpath, path) == 0) {
+                        /* Add reference */
+                        refcount_up(&part->refcnt);
+                        fibril_mutex_unlock(&parts->lock);
+                        free(mpath);
+                        *rpart = part;
+                        return EOK;
+                }
+
+                if (mpath != NULL)
+                        free(mpath);
+        }
+
+        fibril_mutex_unlock(&parts->lock);
+        return ENOENT;
+}
+
 void vol_part_del_ref(vol_part_t *part)
 {

uspace/srv/volsrv/part.h

@@ -52 +52 @@
 extern errno_t vol_part_find_by_id_ref(vol_parts_t *, service_id_t,
     vol_part_t **);
+extern errno_t vol_part_find_by_path_ref(vol_parts_t *, const char *,
+    vol_part_t **);
 extern void vol_part_del_ref(vol_part_t *);
 extern errno_t vol_part_eject_part(vol_part_t *);

uspace/srv/volsrv/volsrv.c

@@ -250 +250 @@
 }
 
+static void vol_part_insert_by_path_srv(vol_parts_t *parts, ipc_call_t *icall)
+{
+        vol_part_t *part;
+        char *path = NULL;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_insert_by_path_srv()");
+
+        rc = async_data_write_accept((void **)&path, true, 0, VOL_MOUNTP_MAXLEN,
+            0, NULL);
+        if (rc != EOK) {
+                async_answer_0(icall, rc);
+                goto error;
+        }
+
+        rc = vol_part_find_by_path_ref(parts, path, &part);
+        if (rc != EOK) {
+                async_answer_0(icall, ENOENT);
+                goto error;
+        }
+
+        rc = vol_part_insert_part(part);
+        if (rc != EOK) {
+                async_answer_0(icall, rc);
+                vol_part_del_ref(part);
+                goto error;
+        }
+
+        free(path);
+        vol_part_del_ref(part);
+        async_answer_0(icall, EOK);
+
+        return;
+error:
+        if (path != NULL)
+                free(path);
+}
+
+
 static void vol_part_empty_srv(vol_parts_t *parts, ipc_call_t *icall)
 {
@@ -545 +584 @@
                         vol_part_insert_srv(parts, &call);
                         break;
+                case VOL_PART_INSERT_BY_PATH:
+                        vol_part_insert_by_path_srv(parts, &call);
+                        break;
                 case VOL_PART_LSUPP:
                         vol_part_get_lsupp_srv(parts, &call);