Changeset 6ba36a0 in mainline for uspace/lib/ext4/src/superblock.c

Timestamp:

2018-10-03T15:31:58Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9b0ceb1

Parents:

b209135

Message:

Setting a custom ext4 volume label.

File:

• uspace/lib/ext4/src/superblock.c (modified) (5 diffs)

uspace/lib/ext4/src/superblock.c

@@ -912 +912 @@
  * @param sb   Superblock
  * @param name New name of the volume
- */
-void ext4_superblock_set_volume_name(ext4_superblock_t *sb, const char *name)
-{
-        memcpy(sb->volume_name, name, sizeof(sb->volume_name));
+ * @return EOK on success or error code
+ */
+errno_t ext4_superblock_set_volume_name(ext4_superblock_t *sb, const char *name)
+{
+        size_t off;
+        wchar_t ch;
+        size_t wi;
+
+        off = 0;
+        wi = 0;
+        while (wi < sizeof(sb->volume_name)) {
+                ch = str_decode(name, &off, STR_NO_LIMIT);
+                if (ch == 0)
+                        break;
+                if (ch > 255)
+                        return EINVAL;
+
+                sb->volume_name[wi++] = ch;
+        }
+
+        while (wi < sizeof(sb->volume_name))
+                sb->volume_name[wi++] = '\0';
+
+        return EOK;
 }
 
@@ -1475 +1495 @@
  * @param dev_bsize Device block size
  * @param dev_bcnt Device number of blocks
- * @param ver Filesystem version
+ * @param cfg Configuration of new file system
  * @param rsb Place to store pointer to newly allocated superblock
  * @return EOK on success or error code
  */
 errno_t ext4_superblock_create(size_t dev_bsize, uint64_t dev_bcnt,
-    ext4_cfg_ver_t ver, ext4_superblock_t **rsb)
+    ext4_cfg_t *cfg, ext4_superblock_t **rsb)
 {
         ext4_superblock_t *sb;
@@ -1579 +1599 @@
         ext4_superblock_set_check_interval(sb, 0);
         ext4_superblock_set_creator_os(sb, EXT4_SUPERBLOCK_OS_LINUX);
-        if (ver >= extver_ext2)
+        if (cfg->version >= extver_ext2)
                 ext4_superblock_set_rev_level(sb, EXT4_DYNAMIC_REV);
         else
@@ -1586 +1606 @@
         ext4_superblock_set_def_resgid(sb, 0);
 
-        if (ver >= extver_ext2) {
+        if (cfg->version >= extver_ext2) {
                 /* Dynamic rev */
                 ext4_superblock_set_first_inode(sb, EXT4_REV0_FIRST_INO);
@@ -1596 +1616 @@
 
                 ext4_superblock_set_uuid(sb, &uuid);
-                /* 16-byte Latin-1 string padded with null characters */
-                ext4_superblock_set_volume_name(sb, "HelenOS-Ext4\0\0\0\0");
+
+                rc = ext4_superblock_set_volume_name(sb, cfg->volume_name);
+                if (rc != EOK)
+                        goto error;
+
                 /* 64-byte Latin-1 string padded with null characters */
                 ext4_superblock_set_last_mounted(sb,