Changeset 1a9174e in mainline for uspace/srv/volsrv/part.c

Timestamp:

2018-06-29T15:35:50Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d3b2ffa

Parents:

72c72d4

git-author:

Jiri Svoboda <jiri@…> (2018-06-28 18:34:52)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-29 15:35:50)

Message:

Volume server needs to react to partitions being removed.

File:

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

uspace/srv/volsrv/part.c

@@ -51 +51 @@
 
 static errno_t vol_part_add_locked(service_id_t);
+static void vol_part_remove_locked(vol_part_t *);
+static errno_t vol_part_find_by_id_ref_locked(service_id_t, vol_part_t **);
+
 static LIST_INITIALIZE(vol_parts); /* of vol_part_t */
 static FIBRIL_MUTEX_INITIALIZE(vol_parts_lock);
@@ -83 +86 @@
 }
 
-/** Check for new partitions */
+/** Check for new and removed partitions */
 static errno_t vol_part_check_new(void)
 {
         bool already_known;
+        bool still_exists;
         category_id_t part_cat;
         service_id_t *svcs;
         size_t count, i;
+        link_t *cur, *next;
+        vol_part_t *part;
         errno_t rc;
 
@@ -109 +115 @@
         }
 
+        /* Check for new partitions */
         for (i = 0; i < count; i++) {
                 already_known = false;
 
+                // XXX Make this faster
                 list_foreach(vol_parts, lparts, vol_part_t, part) {
                         if (part->svc_id == svcs[i]) {
@@ -130 +138 @@
         }
 
+        /* Check for removed partitions */
+        cur = list_first(&vol_parts);
+        while (cur != NULL) {
+                next = list_next(cur, &vol_parts);
+                part = list_get_instance(cur, vol_part_t, lparts);
+
+                still_exists = false;
+                // XXX Make this faster
+                for (i = 0; i < count; i++) {
+                        if (part->svc_id == svcs[i]) {
+                                still_exists = true;
+                                break;
+                        }
+                }
+
+                if (!still_exists) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Partition '%zu' is gone",
+                            part->svc_id);
+                        vol_part_remove_locked(part);
+                }
+
+                cur = next;
+        }
+
+        free(svcs);
+
         fibril_mutex_unlock(&vol_parts_lock);
         return EOK;
@@ -144 +178 @@
         }
 
+        atomic_set(&part->refcnt, 1);
         link_initialize(&part->lparts);
         part->pcnt = vpc_empty;
@@ -152 +187 @@
 static void vol_part_delete(vol_part_t *part)
 {
+        log_msg(LOG_DEFAULT, LVL_ERROR, "Freeing partition %p", part);
         if (part == NULL)
                 return;
@@ -263 +299 @@
 }
 
-
 static errno_t vol_part_add_locked(service_id_t sid)
 {
@@ -273 +308 @@
 
         /* Check for duplicates */
-        rc = vol_part_find_by_id(sid, &part);
-        if (rc == EOK)
+        rc = vol_part_find_by_id_ref_locked(sid, &part);
+        if (rc == EOK) {
+                vol_part_del_ref(part);
                 return EEXIST;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "partition %zu is new", sid);
@@ -308 +345 @@
         vol_part_delete(part);
         return rc;
+}
+
+static void vol_part_remove_locked(vol_part_t *part)
+{
+        assert(fibril_mutex_is_locked(&vol_parts_lock));
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_remove_locked(%zu)", part->svc_id);
+
+        list_remove(&part->lparts);
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Removed partition.");
+        vol_part_del_ref(part);
 }
 
@@ -374 +422 @@
 }
 
-errno_t vol_part_find_by_id(service_id_t sid, vol_part_t **rpart)
-{
+static errno_t vol_part_find_by_id_ref_locked(service_id_t sid,
+    vol_part_t **rpart)
+{
+        assert(fibril_mutex_is_locked(&vol_parts_lock));
+
         list_foreach(vol_parts, lparts, vol_part_t, part) {
                 if (part->svc_id == sid) {
+                        /* Add reference */
+                        atomic_inc(&part->refcnt);
                         *rpart = part;
-                        /* XXX Add reference */
                         return EOK;
                 }
@@ -385 +437 @@
 
         return ENOENT;
+}
+
+errno_t vol_part_find_by_id_ref(service_id_t sid, vol_part_t **rpart)
+{
+        errno_t rc;
+
+        fibril_mutex_lock(&vol_parts_lock);
+        rc = vol_part_find_by_id_ref_locked(sid, rpart);
+        fibril_mutex_unlock(&vol_parts_lock);
+
+        return rc;
+}
+
+void vol_part_del_ref(vol_part_t *part)
+{
+        if (atomic_predec(&part->refcnt) == 0)
+                vol_part_delete(part);
 }