Changeset 6ba36a0 in mainline for uspace/app/mkext4/mkext4.c

Timestamp:

2018-10-03T15:31:58Z (6 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/app/mkext4/mkext4.c (modified) (3 diffs)

uspace/app/mkext4/mkext4.c

@@ -52 +52 @@
         char *dev_path;
         service_id_t service_id;
-        ext4_cfg_ver_t ver;
+        ext4_cfg_t cfg;
         char *endptr;
         aoff64_t nblocks;
-        char *label;
+        const char *label = "";
 
-        ver = ext4_def_fs_version;
+        cfg.version = ext4_def_fs_version;
 
         if (argc < 2) {
@@ -98 +98 @@
                         }
 
-                        rc = ext4_version_parse(*argv, &ver);
+                        rc = ext4_version_parse(*argv, &cfg.version);
                         if (rc != EOK) {
                                 printf(NAME ": Error, invalid argument.\n");
@@ -146 +146 @@
         }
 
-        (void) label;
+        cfg.volume_name = label;
         (void) nblocks;
 
-        rc = ext4_filesystem_create(ver, service_id);
+        rc = ext4_filesystem_create(&cfg, service_id);
         if (rc != EOK) {
                 printf(NAME ": Error initializing file system.\n");