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

Timestamp:

2018-06-29T13:22:39Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

72c72d4

Parents:

5f36841

git-author:

Jiri Svoboda <jiri@…> (2018-06-28 17:22:13)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-29 13:22:39)

Message:

Add volume administration utility.

File:

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

uspace/srv/volsrv/part.c

@@ -155 +155 @@
                 return;
 
+        free(part->cur_mp);
         free(part->svc_name);
         free(part);
@@ -219 +220 @@
 }
 
-static int vol_part_mount(vol_part_t *part)
+static errno_t vol_part_mount(vol_part_t *part)
 {
         char *mp;
-        int rc;
+        int err;
+        errno_t rc;
 
         if (str_size(part->label) < 1) {
@@ -231 +233 @@
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "Determine MP label='%s'", part->label);
-        rc = asprintf(&mp, "/vol/%s", part->label);
-        if (rc < 0) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "rc -> %d", rc);
+        err = asprintf(&mp, "/vol/%s", part->label);
+        if (err < 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory");
                 return ENOMEM;
         }
@@ -255 +257 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "Mount to %s -> %d\n", mp, rc);
 
-        free(mp);
+        part->cur_mp = mp;
+        part->cur_mp_auto = true;
+
         return rc;
 }
@@ -381 +385 @@
 
         return ENOENT;
+}
+
+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;
 }
 
@@ -443 +481 @@
         pinfo->fstype = part->fstype;
         str_cpy(pinfo->label, sizeof(pinfo->label), part->label);
+        str_cpy(pinfo->cur_mp, sizeof(pinfo->cur_mp), part->cur_mp);
+        pinfo->cur_mp_auto = part->cur_mp_auto;
         return EOK;
 }