Changeset 64ffd83 in mainline for uspace/lib

Timestamp:

2018-07-24T09:43:38Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bec18a9

Parents:

05208d9

git-author:

Jiri Svoboda <jiri@…> (2018-07-23 18:41:45)

git-committer:

Jiri Svoboda <jiri@…> (2018-07-24 09:43:38)

Message:

Configuring mount point for (newly created) paritions.

Location:

uspace/lib

Files:

• c/generic/vol.c (modified) (5 diffs)
• c/include/ipc/vol.h (modified) (1 diff)
• c/include/vol.h (modified) (1 diff)
• fdisk/include/types/fdisk.h (modified) (1 diff)
• fdisk/src/fdisk.c (modified) (3 diffs)

uspace/lib/c/generic/vol.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <str.h>
+#include <vfs/vfs.h>
 #include <vol.h>
 
@@ -220 +221 @@
         exch = async_exchange_begin(vol->sess);
         aid_t req = async_send_1(exch, VOL_PART_INFO, sid, &answer);
+
         errno_t rc = async_data_read_start(exch, vinfo, sizeof(vol_part_info_t));
         async_exchange_end(exch);
-
         if (rc != EOK) {
                 async_forget(req);
@@ -294 +295 @@
 }
 
-/** Create file system. */
+/** Create file system.
+ *
+ * @param vol Volume service
+ * @param sid Partition service ID
+ * @param fstype File system type
+ * @param label Volume label
+ * @param mountp Mount point
+ *
+ * @return EOK on success or an error code
+ */
 errno_t vol_part_mkfs(vol_t *vol, service_id_t sid, vol_fstype_t fstype,
-    const char *label)
+    const char *label, const char *mountp)
 {
         async_exch_t *exch;
@@ -304 +314 @@
         exch = async_exchange_begin(vol->sess);
         aid_t req = async_send_2(exch, VOL_PART_MKFS, sid, fstype, &answer);
+
         retval = async_data_write_start(exch, label, str_size(label));
-        async_exchange_end(exch);
-
         if (retval != EOK) {
+                async_exchange_end(exch);
                 async_forget(req);
                 return retval;
         }
 
+        retval = async_data_write_start(exch, mountp, str_size(mountp));
+        if (retval != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return retval;
+        }
+
+        async_exchange_end(exch);
         async_wait_for(req, &retval);
 
@@ -394 +412 @@
 }
 
+/** Validate mount point.
+ *
+ * Verify that mount point is valid. A valid mount point is
+ * one of:
+ *  - 'Auto'
+ *  - 'None'
+ *  - /path (string beginning with '/') to an existing directory
+ *
+ * @return EOK if mount point is in valid, EINVAL if the format is invalid,
+ *         ENOENT if the directory does not exist
+ */
+errno_t vol_mountp_validate(const char *mountp)
+{
+        errno_t rc;
+        vfs_stat_t stat;
+
+        if (str_cmp(mountp, "Auto") == 0 || str_cmp(mountp, "auto") == 0)
+                return EOK;
+
+        if (str_casecmp(mountp, "None") == 0 || str_cmp(mountp, "none") == 0)
+                return EOK;
+
+        if (mountp[0] == '/') {
+                rc = vfs_stat_path(mountp, &stat);
+                if (rc != EOK || !stat.is_directory)
+                        return ENOENT;
+
+                return EOK;
+        }
+
+        return EINVAL;
+}
+
 /** @}
  */

uspace/lib/c/include/ipc/vol.h

@@ -37 +37 @@
 
 #define VOL_LABEL_MAXLEN 63
+#define VOL_MOUNTP_MAXLEN 4096
 
 typedef enum {

uspace/lib/c/include/vol.h

@@ -51 +51 @@
 extern errno_t vol_part_empty(vol_t *, service_id_t);
 extern errno_t vol_part_get_lsupp(vol_t *, vol_fstype_t, vol_label_supp_t *);
-extern errno_t vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t, const char *);
+extern errno_t vol_part_mkfs(vol_t *, service_id_t, vol_fstype_t, const char *,
+    const char *);
 
 extern errno_t vol_fstype_format(vol_fstype_t, char **);
 extern errno_t vol_pcnt_fs_format(vol_part_cnt_t, vol_fstype_t, char **);
+extern errno_t vol_mountp_validate(const char *);
 
 #endif

uspace/lib/fdisk/include/types/fdisk.h

@@ -156 +156 @@
         vol_fstype_t fstype;
         /** Volume label */
-        char *label;
+        const char *label;
+        /** Mount point */
+        const char *mountp;
 } fdisk_part_spec_t;
 

uspace/lib/fdisk/src/fdisk.c

@@ -729 +729 @@
 }
 
+/** Create partition.
+ *
+ * Create new partition based on a specification.
+ *
+ * @param dev Fdisk device
+ * @param pspec Partition specification
+ * @param rpart Place to store pointer to new partition
+ *
+ * @return EOK on success or error code
+ */
 errno_t fdisk_part_create(fdisk_dev_t *dev, fdisk_part_spec_t *pspec,
     fdisk_part_t **rpart)
@@ -737 +747 @@
         vol_part_info_t vpinfo;
         const char *label;
+        const char *mountp;
         errno_t rc;
 
         label = pspec->label != NULL ? pspec->label : "";
+        mountp = pspec->mountp != NULL ? pspec->mountp : "";
 
         rc = fdisk_part_spec_prepare(dev, pspec, &vpspec);
@@ -761 +773 @@
         if (part->svc_id != 0) {
                 rc = vol_part_mkfs(dev->fdisk->vol, part->svc_id, pspec->fstype,
-                    label);
+                    label, mountp);
                 if (rc != EOK && rc != ENOTSUP) {
                         rc = EIO;