Changeset d3b2ffa in mainline for uspace/srv/volsrv/volsrv.c

Timestamp:

2018-06-29T15:40:10Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5e904dd

Parents:

1e472ee (diff), 1a9174e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge volume management improvements (still WIP).

File:

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

uspace/srv/volsrv/volsrv.c

@@ -144 +144 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_info_srv(%zu)",
             sid);
-        rc = vol_part_find_by_id(sid, &part);
+        rc = vol_part_find_by_id_ref(sid, &part);
         if (rc != EOK) {
                 async_answer_0(icall_handle, ENOENT);
@@ -153 +153 @@
         if (rc != EOK) {
                 async_answer_0(icall_handle, EIO);
-                return;
+                goto error;
         }
 
@@ -161 +161 @@
                 async_answer_0(chandle, EREFUSED);
                 async_answer_0(icall_handle, EREFUSED);
-                return;
+                goto error;
         }
 
@@ -167 +167 @@
                 async_answer_0(chandle, EINVAL);
                 async_answer_0(icall_handle, EINVAL);
-                return;
+                goto error;
         }
 
@@ -175 +175 @@
                 async_answer_0(chandle, rc);
                 async_answer_0(icall_handle, rc);
-                return;
-        }
-
-        async_answer_0(icall_handle, EOK);
+                goto error;
+        }
+
+        async_answer_0(icall_handle, EOK);
+error:
+        vol_part_del_ref(part);
+}
+
+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_ref(sid, &part);
+        if (rc != EOK) {
+                async_answer_0(icall_handle, ENOENT);
+                goto error;
+        }
+
+        rc = vol_part_eject_part(part);
+        if (rc != EOK) {
+                async_answer_0(icall_handle, EIO);
+                goto error;
+        }
+
+        async_answer_0(icall_handle, EOK);
+error:
+        vol_part_del_ref(part);
 }
 
@@ -190 +218 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_srv(%zu)", sid);
 
-        rc = vol_part_find_by_id(sid, &part);
+        rc = vol_part_find_by_id_ref(sid, &part);
         if (rc != EOK) {
                 async_answer_0(icall_handle, ENOENT);
@@ -199 +227 @@
         if (rc != EOK) {
                 async_answer_0(icall_handle, EIO);
-                return;
-        }
-
-        async_answer_0(icall_handle, EOK);
+                goto error;
+        }
+
+        async_answer_0(icall_handle, EOK);
+error:
+        vol_part_del_ref(part);
 }
 
@@ -251 +281 @@
         errno_t rc;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv()");
+
         sid = IPC_GET_ARG1(*icall);
         fstype = IPC_GET_ARG2(*icall);
@@ -261 +293 @@
         }
 
-        printf("vol_part_mkfs_srv: label=%p\n", label);
-        if (label != NULL)
-                printf("vol_part_mkfs_srv: label='%s'\n", label);
-
-        rc = vol_part_find_by_id(sid, &part);
+        if (label != NULL) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv: label='%s'",
+                    label);
+        }
+
+        rc = vol_part_find_by_id_ref(sid, &part);
         if (rc != EOK) {
                 free(label);
@@ -276 +309 @@
                 free(label);
                 async_answer_0(icall_handle, rc);
+                vol_part_del_ref(part);
                 return;
         }
@@ -311 +345 @@
                         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);