Changeset f0f8787 in mainline for uspace/srv

Timestamp:

2018-10-04T14:53:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c5429fe

Parents:

1bb43d5

git-author:

Jiri Svoboda <jiri@…> (2018-10-03 21:51:40)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-04 14:53:29)

Message:

Add vol insert subcommand to re-insert a previously ejected volume.

Location:

uspace/srv/volsrv

Files:

• part.c (modified) (1 diff)
• part.h (modified) (1 diff)
• volsrv.c (modified) (2 diffs)

uspace/srv/volsrv/part.c

@@ -602 +602 @@
 }
 
+/** Insert volume.
+ *
+ * Re-mount the volume in the partition, if applicable.
+ *
+ * @param part Partition
+ */
+errno_t vol_part_insert_part(vol_part_t *part)
+{
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_insert_part()");
+
+        fibril_mutex_lock(&part->parts->lock);
+
+        if (part->cur_mp != NULL) {
+                fibril_mutex_unlock(&part->parts->lock);
+                return EOK;
+        }
+
+        rc = vol_part_probe(part);
+        if (rc != EOK)
+                goto error;
+
+        rc = vol_part_mount(part);
+        if (rc != EOK)
+                goto error;
+
+        fibril_mutex_unlock(&part->parts->lock);
+
+        return EOK;
+error:
+        return rc;
+}
+
 /** Set mount point.
  *

uspace/srv/volsrv/part.h

@@ -55 +55 @@
 extern errno_t vol_part_eject_part(vol_part_t *);
 extern errno_t vol_part_empty_part(vol_part_t *);
+extern errno_t vol_part_insert_part(vol_part_t *);
 extern errno_t vol_part_mkfs_part(vol_part_t *, vol_fstype_t, const char *,
     const char *);

uspace/srv/volsrv/volsrv.c

@@ -210 +210 @@
         if (rc != EOK) {
                 async_answer_0(icall, ENOENT);
-                goto error;
+                return;
         }
 
         rc = vol_part_eject_part(part);
+        if (rc != EOK) {
+                async_answer_0(icall, EIO);
+                goto error;
+        }
+
+        async_answer_0(icall, EOK);
+error:
+        vol_part_del_ref(part);
+}
+
+static void vol_part_insert_srv(vol_parts_t *parts, ipc_call_t *icall)
+{
+        service_id_t sid;
+        vol_part_t *part;
+        errno_t rc;
+
+        sid = IPC_GET_ARG1(*icall);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_insert_srv(%zu)", sid);
+
+        rc = vol_part_find_by_id_ref(parts, sid, &part);
+        if (rc != EOK) {
+                async_answer_0(icall, ENOENT);
+                return;
+        }
+
+        rc = vol_part_insert_part(part);
         if (rc != EOK) {
                 async_answer_0(icall, EIO);
@@ -429 +455 @@
                         vol_part_empty_srv(parts, &call);
                         break;
+                case VOL_PART_INSERT:
+                        vol_part_insert_srv(parts, &call);
+                        break;
                 case VOL_PART_LSUPP:
                         vol_part_get_lsupp_srv(parts, &call);