Changeset edebb4a1 in mainline for uspace/srv/volsrv/part.c

Timestamp:

2015-10-14T22:30:12Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ea0ff6b

Parents:

4b6635a7

Message:

Handle dummy partition addition/removal during label destruction/creation. Handle dummy label properly in fdisk.

File:

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

uspace/srv/volsrv/part.c

@@ -47 +47 @@
 #include "types/part.h"
 
-static int vol_part_add(service_id_t);
-
+static int vol_part_add_locked(service_id_t);
 static LIST_INITIALIZE(vol_parts); /* of vol_part_t */
 static FIBRIL_MUTEX_INITIALIZE(vol_parts_lock);
@@ -91 +90 @@
                         log_msg(LOG_DEFAULT, LVL_NOTE, "Found partition '%lu'",
                             (unsigned long) svcs[i]);
-                        rc = vol_part_add(svcs[i]);
+                        rc = vol_part_add_locked(svcs[i]);
                         if (rc != EOK) {
                                 log_msg(LOG_DEFAULT, LVL_ERROR, "Could not add "
@@ -128 +127 @@
 }
 
-static int vol_part_add(service_id_t sid)
+static int vol_part_add_locked(service_id_t sid)
 {
         vol_part_t *part;
@@ -135 +134 @@
 
         assert(fibril_mutex_is_locked(&vol_parts_lock));
+
+        /* Check for duplicates */
+        rc = vol_part_find_by_id(sid, &part);
+        if (rc == EOK)
+                return EEXIST;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_add()");
@@ -160 +164 @@
         list_append(&part->lparts, &vol_parts);
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Added partition %zu", part->svc_id);
+
         return EOK;
 
 error:
         vol_part_delete(part);
+        return rc;
+}
+
+int vol_part_add(service_id_t sid)
+{
+        int rc;
+
+        fibril_mutex_lock(&vol_parts_lock);
+        rc = vol_part_add_locked(sid);
+        fibril_mutex_unlock(&vol_parts_lock);
+
         return rc;
 }