Changeset 72c72d4 in mainline for uspace/srv

Timestamp:

2018-06-29T13:41:13Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1a9174e

Parents:

db9c889

git-author:

Jiri Svoboda <jiri@…> (2018-06-28 17:40:58)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-29 13:41:13)

Message:

Basic volume eject implementation.

Location:

uspace/srv/volsrv

Files:

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

uspace/srv/volsrv/part.c

@@ -478 +478 @@
 errno_t vol_part_get_info(vol_part_t *part, vol_part_info_t *pinfo)
 {
+        memset(pinfo, 0, sizeof(*pinfo));
+
         pinfo->pcnt = part->pcnt;
         pinfo->fstype = part->fstype;
         str_cpy(pinfo->label, sizeof(pinfo->label), part->label);
-        str_cpy(pinfo->cur_mp, sizeof(pinfo->cur_mp), part->cur_mp);
+        if (part->cur_mp != NULL)
+                str_cpy(pinfo->cur_mp, sizeof(pinfo->cur_mp), part->cur_mp);
         pinfo->cur_mp_auto = part->cur_mp_auto;
         return EOK;

uspace/srv/volsrv/volsrv.c

@@ -181 +181 @@
 }
 
+static void vol_part_eject_srv(cap_call_handle_t icall_handle, 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_eject_srv(%zu)", sid);
+
+        rc = vol_part_find_by_id(sid, &part);
+        if (rc != EOK) {
+                async_answer_0(icall_handle, ENOENT);
+                return;
+        }
+
+        rc = vol_part_eject_part(part);
+        if (rc != EOK) {
+                async_answer_0(icall_handle, EIO);
+                return;
+        }
+
+        async_answer_0(icall_handle, EOK);
+}
+
 static void vol_part_empty_srv(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
@@ -314 +338 @@
                         vol_part_info_srv(chandle, &call);
                         break;
+                case VOL_PART_EJECT:
+                        vol_part_eject_srv(chandle, &call);
+                        break;
                 case VOL_PART_EMPTY:
                         vol_part_empty_srv(chandle, &call);