Changeset 3a9cf35 in mainline

Timestamp:

2016-01-16T19:11:12Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8e670dd

Parents:

4f29118

Message:

VBD should take note of devices disappearing.

Location:

uspace/srv

Files:

• bd/vbd/disk.c (modified) (7 diffs)
• bd/vbd/types/vbd.h (modified) (2 diffs)
• locsrv/locsrv.c (modified) (2 diffs)

uspace/srv/bd/vbd/disk.c

@@ -89 +89 @@
 }
 
+static vbds_disk_t *vbds_disk_first(void)
+{
+        link_t *link;
+
+        link = list_first(&vbds_disks);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, vbds_disk_t, ldisks);
+}
+
+static vbds_disk_t *vbds_disk_next(vbds_disk_t *disk)
+{
+        link_t *link;
+
+        if (disk == NULL)
+                return NULL;
+
+        link = list_next(&disk->ldisks, &vbds_disks);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, vbds_disk_t, ldisks);
+}
+
 int vbds_disks_init(void)
 {
@@ -107 +132 @@
 }
 
-/** Check for new disk devices */
+/** Check for new/removed disk devices */
 static int vbds_disks_check_new(void)
 {
@@ -114 +139 @@
         service_id_t *svcs;
         size_t count, i;
-        int rc;
+        vbds_disk_t *cur, *next;
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_disks_check_new()");
 
         fibril_mutex_lock(&vbds_disks_lock);
@@ -133 +161 @@
         }
 
+        list_foreach(vbds_disks, ldisks, vbds_disk_t, disk)
+                disk->present = false;
+
         for (i = 0; i < count; i++) {
                 already_known = false;
@@ -139 +170 @@
                         if (disk->svc_id == svcs[i]) {
                                 already_known = true;
+                                disk->present = true;
                                 break;
                         }
@@ -151 +183 @@
                                     "disk.");
                         }
+                } else {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Disk %lu already known",
+                            (unsigned long) svcs[i]);
                 }
+        }
+
+        cur = vbds_disk_first();
+        while (cur != NULL) {
+                next = vbds_disk_next(cur);
+                if (!cur->present) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Disk '%lu' is gone",
+                            (unsigned long) cur->svc_id);
+                        rc = vbds_disk_remove(cur->svc_id);
+                        if (rc != EOK) {
+                                log_msg(LOG_DEFAULT, LVL_ERROR, "Could not "
+                                    "remove disk.");
+                        }
+                }
+
+                cur = next;
         }
 
@@ -403 +454 @@
         disk->label = label;
         disk->block_size = block_size;
+        disk->present = true;
 
         list_initialize(&disk->parts);

uspace/srv/bd/vbd/types/vbd.h

@@ -42 +42 @@
 #include <label.h>
 #include <loc.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <types/label.h>
@@ -87 +88 @@
         /** Block size */
         size_t block_size;
+        /** Used to mark disks still present during re-discovery */
+        bool present;
 } vbds_disk_t;
 

uspace/srv/locsrv/locsrv.c

@@ -445 +445 @@
         free(server);
         
+        loc_category_change_event();
         return EOK;
 }
@@ -557 +558 @@
         fibril_mutex_unlock(&services_list_mutex);
         async_answer_0(iid, EOK);
+
+        loc_category_change_event();
 }