Changes in uspace/srv/volsrv/volsrv.c [9e45a41:4285f384] in mainline

File:

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

uspace/srv/volsrv/volsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -53 +53 @@
 #define NAME  "volsrv"
 
-const char *vol_cfg_file = "/cfg/volsrv.sif";
+const char *vol_icfg_file = "/cfg/initvol.sif";
+const char *vol_cfg_file = "/w/cfg/volsrv.sif";
 
 static void vol_client_conn(ipc_call_t *, void *);
@@ -62 +63 @@
         vol_volumes_t *volumes = NULL;
         vol_parts_t *parts = NULL;
+        loc_srv_t *srv = NULL;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
 
-        rc = vol_volumes_create(vol_cfg_file, &volumes);
+        rc = vol_volumes_create(vol_icfg_file, &volumes);
         if (rc != EOK)
                 goto error;
@@ -79 +81 @@
         async_set_fallback_port_handler(vol_client_conn, parts);
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
@@ -86 +88 @@
 
         service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_VOLSRV, &sid);
+        rc = loc_service_register(srv, SERVICE_NAME_VOLSRV, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
@@ -95 +97 @@
         return EOK;
 error:
+        if (srv != NULL)
+                loc_server_unregister(srv);
         vol_volumes_destroy(volumes);
         vol_parts_destroy(parts);
@@ -201 +205 @@
 {
         service_id_t sid;
+        vol_eject_flags_t flags;
         vol_part_t *part;
         errno_t rc;
 
         sid = ipc_get_arg1(icall);
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_srv(%zu)", sid);
+        flags = ipc_get_arg2(icall);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_srv(%zu, %x)",
+            sid, flags);
 
         rc = vol_part_find_by_id_ref(parts, sid, &part);
@@ -213 +221 @@
         }
 
-        rc = vol_part_eject_part(part);
+        rc = vol_part_eject_part(part, flags);
         if (rc != EOK) {
                 async_answer_0(icall, EIO);