Changes in uspace/srv/volsrv/part.c [5a6cc679:1a9174e] in mainline

File:

• uspace/srv/volsrv/part.c (modified) (14 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);
@@ -68 +71 @@
 };
 
-/** Check for new partitions */
+static const char *fstype_str(vol_fstype_t fstype)
+{
+        struct fsname_type *fst;
+
+        fst = &fstab[0];
+        while (fst->name != NULL) {
+                if (fst->fstype == fstype)
+                        return fst->name;
+                ++fst;
+        }
+
+        assert(false);
+        return NULL;
+}
+
+/** 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;
 
@@ -94 +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]) {
@@ -115 +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;
@@ -129 +178 @@
         }
 
+        atomic_set(&part->refcnt, 1);
         link_initialize(&part->lparts);
         part->pcnt = vpc_empty;
@@ -137 +187 @@
 static void vol_part_delete(vol_part_t *part)
 {
+        log_msg(LOG_DEFAULT, LVL_ERROR, "Freeing partition %p", part);
         if (part == NULL)
                 return;
 
+        free(part->cur_mp);
         free(part->svc_name);
         free(part);
@@ -204 +256 @@
 }
 
+static errno_t vol_part_mount(vol_part_t *part)
+{
+        char *mp;
+        int err;
+        errno_t rc;
+
+        if (str_size(part->label) < 1) {
+                /* Don't mount nameless volumes */
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Not mounting nameless partition.");
+                return EOK;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Determine MP label='%s'", part->label);
+        err = asprintf(&mp, "/vol/%s", part->label);
+        if (err < 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory");
+                return ENOMEM;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Create mount point '%s'", mp);
+        rc = vfs_link_path(mp, KIND_DIRECTORY, NULL);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating mount point '%s'",
+                    mp);
+                free(mp);
+                return EIO;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Call vfs_mount_path mp='%s' fstype='%s' svc_name='%s'",
+            mp, fstype_str(part->fstype), part->svc_name);
+        rc = vfs_mount_path(mp, fstype_str(part->fstype),
+            part->svc_name, "", 0, 0);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Failed mounting to %s", mp);
+        }
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Mount to %s -> %d\n", mp, rc);
+
+        part->cur_mp = mp;
+        part->cur_mp_auto = true;
+
+        return rc;
+}
+
 static errno_t vol_part_add_locked(service_id_t sid)
 {
@@ -210 +305 @@
 
         assert(fibril_mutex_is_locked(&vol_parts_lock));
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_add_locked(%zu)", sid);
 
         /* 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_DEBUG, "vol_part_add_locked()");
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "partition %zu is new", sid);
+
         part = vol_part_new();
         if (part == NULL)
@@ -233 +332 @@
                 goto error;
 
+        rc = vol_part_mount(part);
+        if (rc != EOK)
+                goto error;
+
         list_append(&part->lparts, &vol_parts);
 
@@ -242 +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);
 }
 
@@ -308 +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;
                 }
@@ -319 +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);
+}
+
+errno_t vol_part_eject_part(vol_part_t *part)
+{
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_part()");
+
+        if (part->cur_mp == NULL) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Attempt to mount unmounted "
+                    "partition.");
+                return EINVAL;
+        }
+
+        rc = vfs_unmount_path(part->cur_mp);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed unmounting partition "
+                    "from %s", part->cur_mp);
+                return rc;
+        }
+
+        if (part->cur_mp_auto) {
+                rc = vfs_unlink_path(part->cur_mp);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed deleting "
+                            "mount directory %s.", part->cur_mp);
+                }
+        }
+
+        free(part->cur_mp);
+        part->cur_mp = NULL;
+        part->cur_mp_auto = false;
+
+        return EOK;
 }
 
@@ -366 +535 @@
         }
 
+        rc = vol_part_mount(part);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&vol_parts_lock);
+                return rc;
+        }
+
         fibril_mutex_unlock(&vol_parts_lock);
         return EOK;
@@ -372 +547 @@
 errno_t vol_part_get_info(vol_part_t *part, vol_part_info_t *pinfo)
 {
+        memset(pinfo, 0, sizeof(*pinfo));
+
         pinfo->pcnt = part->pcnt;
         pinfo->fstype = part->fstype;
         str_cpy(pinfo->label, sizeof(pinfo->label), part->label);
+        if (part->cur_mp != NULL)
+                str_cpy(pinfo->cur_mp, sizeof(pinfo->cur_mp), part->cur_mp);
+        pinfo->cur_mp_auto = part->cur_mp_auto;
         return EOK;
 }