Changeset 2175178 in mainline

Timestamp:

2018-10-03T08:34:52Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b209135

Parents:

174156fd

git-author:

Jiri Svoboda <jiri@…> (2018-10-02 21:31:25)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-03 08:34:52)

Message:

Allow creating ext2 dynamic revision. Allow choosing ext filesystem version by mkext4 argument. Fix support for filesystems without filetype feature.

Location:

uspace

Files:

• app/mkext4/mkext4.c (modified) (5 diffs)
• lib/ext4/include/ext4/cfg.h (added)
• lib/ext4/include/ext4/filesystem.h (modified) (1 diff)
• lib/ext4/include/ext4/superblock.h (modified) (2 diffs)
• lib/ext4/src/directory.c (modified) (1 diff)
• lib/ext4/src/filesystem.c (modified) (3 diffs)
• lib/ext4/src/superblock.c (modified) (3 diffs)

uspace/app/mkext4/mkext4.c

@@ -45 +45 @@
 
 static void syntax_print(void);
+static errno_t ext4_version_parse(const char *, ext4_cfg_ver_t *);
 
 int main(int argc, char **argv)
@@ -51 +52 @@
         char *dev_path;
         service_id_t service_id;
+        ext4_cfg_ver_t ver;
         char *endptr;
         aoff64_t nblocks;
         char *label;
+
+        ver = ext4_def_fs_version;
 
         if (argc < 2) {
@@ -76 +80 @@
                         nblocks = strtol(*argv, &endptr, 10);
                         if (*endptr != '\0') {
+                                printf(NAME ": Error, invalid argument.\n");
+                                syntax_print();
+                                return 1;
+                        }
+
+                        --argc;
+                        ++argv;
+                }
+
+                if (str_cmp(*argv, "--type") == 0) {
+                        --argc;
+                        ++argv;
+                        if (*argv == NULL) {
+                                printf(NAME ": Error, argument missing.\n");
+                                syntax_print();
+                                return 1;
+                        }
+
+                        rc = ext4_version_parse(*argv, &ver);
+                        if (rc != EOK) {
                                 printf(NAME ": Error, invalid argument.\n");
                                 syntax_print();
@@ -125 +149 @@
         (void) nblocks;
 
-        rc = ext4_filesystem_create(service_id);
+        rc = ext4_filesystem_create(ver, service_id);
         if (rc != EOK) {
                 printf(NAME ": Error initializing file system.\n");
@@ -141 +165 @@
         printf("options:\n"
             "\t--size <sectors> Filesystem size, overrides device size\n"
-            "\t--label <label>  Volume label\n");
+            "\t--label <label>  Volume label\n"
+            "\t--type <fstype>  Filesystem type (ext2, ext2old)\n");
+}
+
+static errno_t ext4_version_parse(const char *str, ext4_cfg_ver_t *ver)
+{
+        if (str_cmp(str, "ext2old") == 0) {
+                *ver = extver_ext2_old;
+                return EOK;
+        }
+
+        if (str_cmp(str, "ext2") == 0) {
+                *ver = extver_ext2;
+                return EOK;
+        }
+
+        return EINVAL;
 }
 

uspace/lib/ext4/include/ext4/filesystem.h

@@ -37 +37 @@
 
 #include <block.h>
+#include "ext4/cfg.h"
 #include "ext4/fstypes.h"
 #include "ext4/types.h"
 
 extern errno_t ext4_filesystem_probe(service_id_t);
-extern errno_t ext4_filesystem_create(service_id_t);
+extern errno_t ext4_filesystem_create(ext4_cfg_ver_t, service_id_t);
 extern errno_t ext4_filesystem_open(ext4_instance_t *, service_id_t,
     enum cache_mode, aoff64_t *, ext4_filesystem_t **);

uspace/lib/ext4/include/ext4/superblock.h

@@ -39 +39 @@
 #include <stdint.h>
 #include <uuid.h>
+#include "ext4/cfg.h"
 #include "ext4/types.h"
 
@@ -164 +165 @@
 extern uint32_t ext4_superblock_get_inodes_in_group(ext4_superblock_t *,
     uint32_t);
-extern errno_t ext4_superblock_create(size_t, uint64_t, ext4_superblock_t **);
+extern errno_t ext4_superblock_create(size_t, uint64_t, ext4_cfg_ver_t,
+    ext4_superblock_t **);
 extern uint32_t ext4_superblock_get_group_backup_blocks(ext4_superblock_t *,
     uint32_t);

uspace/lib/ext4/src/directory.c

@@ -369 +369 @@
 
         /* Set type of entry */
-        if (ext4_inode_is_type(sb, child->inode, EXT4_INODE_MODE_DIRECTORY))
+        if (!ext4_superblock_has_feature_incompatible(sb, EXT4_FEATURE_INCOMPAT_FILETYPE))
+                ext4_directory_entry_ll_set_inode_type(sb, entry,
+                    EXT4_DIRECTORY_FILETYPE_UNKNOWN);
+        else if (ext4_inode_is_type(sb, child->inode, EXT4_INODE_MODE_DIRECTORY))
                 ext4_directory_entry_ll_set_inode_type(sb, entry,
                     EXT4_DIRECTORY_FILETYPE_DIR);

uspace/lib/ext4/src/filesystem.c

@@ -48 +48 @@
 #include "ext4/bitmap.h"
 #include "ext4/block_group.h"
+#include "ext4/cfg.h"
 #include "ext4/directory.h"
 #include "ext4/extent.h"
@@ -248 +249 @@
 /** Create new filesystem.
  *
+ * @param ver Filesystem version
  * @param service_id Block device where to create new filesystem
  */
-errno_t ext4_filesystem_create(service_id_t service_id)
+errno_t ext4_filesystem_create(ext4_cfg_ver_t ver, service_id_t service_id)
 {
         errno_t rc;
@@ -280 +282 @@
 
         /* Create superblock */
-        rc = ext4_superblock_create(dev_bsize, dev_nblocks, &superblock);
+        rc = ext4_superblock_create(dev_bsize, dev_nblocks, ver, &superblock);
         if (rc != EOK)
                 goto err;

uspace/lib/ext4/src/superblock.c

@@ -45 +45 @@
 #include <stdlib.h>
 #include <time.h>
+#include "ext4/cfg.h"
 #include "ext4/superblock.h"
 
@@ -1454 +1455 @@
  * @param dev_bsize Device block size
  * @param dev_bcnt Device number of blocks
+ * @param ver Filesystem version
  * @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_superblock_t **rsb)
+    ext4_cfg_ver_t ver, ext4_superblock_t **rsb)
 {
         ext4_superblock_t *sb;
@@ -1557 +1559 @@
         ext4_superblock_set_check_interval(sb, 0);
         ext4_superblock_set_creator_os(sb, EXT4_SUPERBLOCK_OS_LINUX);
-        ext4_superblock_set_rev_level(sb, EXT4_GOOD_OLD_REV);
+        if (ver >= extver_ext2)
+                ext4_superblock_set_rev_level(sb, EXT4_DYNAMIC_REV);
+        else
+                ext4_superblock_set_rev_level(sb, EXT4_GOOD_OLD_REV);
         ext4_superblock_set_def_resuid(sb, 0);
         ext4_superblock_set_def_resgid(sb, 0);
+
+        if (ver >= extver_ext2) {
+                /* Dynamic rev */
+                ext4_superblock_set_first_inode(sb, EXT4_REV0_FIRST_INO);
+                ext4_superblock_set_inode_size(sb, EXT4_REV0_INODE_SIZE);
+                ext4_superblock_set_block_group_index(sb, 0); // XXX
+                ext4_superblock_set_features_compatible(sb, 0);
+                ext4_superblock_set_features_incompatible(sb, 0);
+                ext4_superblock_set_features_read_only(sb, 0);
+
+                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");
+                /* 64-byte Latin-1 string padded with null characters */
+                ext4_superblock_set_last_mounted(sb,
+                    "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+                    "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+                sb->algorithm_usage_bitmap = 0;
+        }
 #if 0
-        /* Dynamic rev */
-        ext4_superblock_set_first_inode(sb, EXT4_REV0_FIRST_INO);
-        ext4_superblock_set_inode_size(sb, EXT4_REV0_INODE_SIZE);
-        ext4_superblock_set_block_group_index(sb, 0); // XXX
-        ext4_superblock_set_features_compatible(sb, 0);
-        ext4_superblock_set_features_incompatible(sb, 0);
-        ext4_superblock_set_features_read_only(sb, 0);
-
-        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");
-        /* 64-byte Latin-1 string padded with null characters */
-        ext4_superblock_set_last_mounted(sb,
-            "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-            "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-        sb->algorithm_usage_bitmap = 0;
-
         /* Journalling */
         ext4_superblock_set_desc_size(sb, EXT4_MAX_BLOCK_GROUP_DESCRIPTOR_SIZE);