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

File:

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

uspace/srv/volsrv/part.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 
 #include <adt/list.h>
+#include <bd.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -52 +53 @@
 #include "types/part.h"
 #include "volume.h"
+#include "volsrv.h"
 
 static errno_t vol_part_add_locked(vol_parts_t *, service_id_t);
@@ -403 +405 @@
         part->cur_mp_auto = mp_auto;
 
+        if (str_cmp(mp, "/w") == 0) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Mounted system volume - "
+                    "loading additional configuration.");
+                rc = vol_volumes_merge_to(part->parts->volumes,
+                    vol_cfg_file);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error loading "
+                            "additional configuration.");
+                        return rc;
+                }
+        }
+
         return rc;
 }
@@ -629 +643 @@
 }
 
-errno_t vol_part_eject_part(vol_part_t *part)
+static errno_t vol_part_eject_device(service_id_t svcid)
+{
+        async_sess_t *sess;
+        errno_t rc;
+        bd_t *bd;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_device(%zu)",
+            (size_t)svcid);
+
+        sess = loc_service_connect(svcid, INTERFACE_BLOCK, 0);
+        if (sess == NULL)
+                return EIO;
+
+        rc = bd_open(sess, &bd);
+        if (rc != EOK) {
+                async_hangup(sess);
+                return EIO;
+        }
+
+        rc = bd_eject(bd);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "vol_part_eject_device(): "
+                    "eject fail");
+                bd_close(bd);
+                async_hangup(sess);
+                return EIO;
+        }
+
+        bd_close(bd);
+        async_hangup(sess);
+        return EOK;
+}
+
+errno_t vol_part_eject_part(vol_part_t *part, vol_eject_flags_t flags)
 {
         int rc;
@@ -636 +683 @@
 
         if (part->cur_mp == NULL) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Attempt to mount unmounted "
-                    "partition.");
-                return EINVAL;
+                /* Partition is not mounted, nothing to do. */
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Partition not mounted, "
+                    "nothing to do.");
+                goto done;
         }
 
@@ -656 +704 @@
         }
 
+        if ((flags & vef_physical) != 0) {
+                rc = vol_part_eject_device(part->svc_id);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed physically "
+                            "ejecting device %s.", part->svc_name);
+                }
+        }
+
         free(part->cur_mp);
         part->cur_mp = NULL;
         part->cur_mp_auto = false;
-
+done:
         return EOK;
 }
@@ -805 +861 @@
 
         if (part->cur_mp != NULL) {
-                rc = vol_part_eject_part(part);
+                rc = vol_part_eject_part(part, vef_none);
                 if (rc != EOK)
                         return rc;