Changeset b1490d2 in mainline for uspace/srv/system/system.c

Timestamp:

2025-02-03T16:04:17Z (16 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Parents:

c3d9aaf5

Message:

Explicit wait for system volume is no longer needed.

Now it is guaranteed that, if the volume was inserted at power-on time,
it is mounted at this point. This is because (1) srv_start(devman)
only returns once all devices have been enumerated and
(2) srv_start(volsrv) only returns once all volumes have been mounted.

File:

• uspace/srv/system/system.c (modified) (2 diffs)

uspace/srv/system/system.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2005 Martin Decky
  * All rights reserved.
@@ -382 +382 @@
                 printf("%s: System volume is configured.\n", NAME);
 
-                /* Wait until system volume is mounted */
+                /* Verify that system volume is mounted */
                 sv_mounted = false;
 
-                while (true) {
-                        rc = vol_get_parts(vol, &part_ids, &nparts);
+                rc = vol_get_parts(vol, &part_ids, &nparts);
+                if (rc != EOK) {
+                        printf("Error getting list of volumes.\n");
+                        goto error;
+                }
+
+                for (i = 0; i < nparts; i++) {
+                        rc = vol_part_info(vol, part_ids[i], &pinfo);
                         if (rc != EOK) {
-                                printf("Error getting list of volumes.\n");
+                                printf("Error getting partition "
+                                    "information.\n");
+                                rc = EIO;
                                 goto error;
                         }
 
-                        for (i = 0; i < nparts; i++) {
-                                rc = vol_part_info(vol, part_ids[i], &pinfo);
-                                if (rc != EOK) {
-                                        printf("Error getting partition "
-                                            "information.\n");
-                                        rc = EIO;
-                                        goto error;
-                                }
-
-                                if (str_cmp(pinfo.cur_mp, "/w") == 0) {
-                                        sv_mounted = true;
-                                        break;
-                                }
+                        if (str_cmp(pinfo.cur_mp, "/w") == 0) {
+                                sv_mounted = true;
+                                break;
                         }
-
-                        if (sv_mounted)
-                                break;
-
-                        free(part_ids);
-                        part_ids = NULL;
-
-                        fibril_sleep(1);
-                        printf("Sleeping(1) for system volume.\n");
-                }
+                }
+
+                if (sv_mounted == false) {
+                        printf("System volume not found.\n");
+                        rc = EIO;
+                        goto error;
+                }
+
+                free(part_ids);
+                part_ids = NULL;
+
         }