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

File:

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

uspace/srv/volsrv/part.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -52 +52 @@
 #include "types/part.h"
 #include "volume.h"
-#include "volsrv.h"
 
 static errno_t vol_part_add_locked(vol_parts_t *, service_id_t);
@@ -404 +403 @@
         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;
 }
@@ -649 +636 @@
 
         if (part->cur_mp == NULL) {
-                /* Partition is not mounted, nothing to do. */
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Partition not mounted, "
-                    "nothing to do.");
-                goto done;
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Attempt to mount unmounted "
+                    "partition.");
+                return EINVAL;
         }
 
@@ -673 +659 @@
         part->cur_mp = NULL;
         part->cur_mp_auto = false;
-done:
+
         return EOK;
 }