Changeset 6ba36a0 in mainline for uspace/lib/ext4/include

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.

Location:

uspace/lib/ext4/include/ext4

Files:

• cfg.h (modified) (2 diffs)
• filesystem.h (modified) (1 diff)
• superblock.h (modified) (2 diffs)
• types.h (modified) (1 diff)

uspace/lib/ext4/include/ext4/cfg.h

@@ -34 +34 @@
 #define LIBEXT4_CFG_H_
 
+#include "types.h"
+
 /** Versions available to choose from when creating a new file system. */
 typedef enum {
@@ -45 +47 @@
 #define ext4_def_fs_version extver_ext2
 
+/** Configuration of a new ext4 file system */
+typedef struct {
+        /** File system version */
+        ext4_cfg_ver_t version;
+        /** Volume name encoded as UTF-8 string */
+        const char *volume_name;
+} ext4_cfg_t;
+
 #endif
 

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

@@ -42 +42 @@
 
 extern errno_t ext4_filesystem_probe(service_id_t, ext4_fs_probe_info_t *);
-extern errno_t ext4_filesystem_create(ext4_cfg_ver_t, service_id_t);
+extern errno_t ext4_filesystem_create(ext4_cfg_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

@@ -120 +120 @@
 extern errno_t ext4_superblock_get_volume_name(ext4_superblock_t *, char *,
     size_t);
-extern void ext4_superblock_set_volume_name(ext4_superblock_t *, const char *);
+extern errno_t ext4_superblock_set_volume_name(ext4_superblock_t *, const char *);
 extern const char *ext4_superblock_get_last_mounted(ext4_superblock_t *);
 extern void ext4_superblock_set_last_mounted(ext4_superblock_t *, const char *);
@@ -166 +166 @@
 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_cfg_ver_t,
+extern errno_t ext4_superblock_create(size_t, uint64_t, ext4_cfg_t *,
     ext4_superblock_t **);
 extern uint32_t ext4_superblock_get_group_backup_blocks(ext4_superblock_t *,

uspace/lib/ext4/include/ext4/types.h

@@ -235 +235 @@
 } ext4_filesystem_t;
 
+/** Size of buffer for volume name. To hold 16 latin-1 chars encoded as UTF-8
+ * and a null terminator we need 2 * 16 + 1 bytes
+ */
+#define EXT4_VOL_NAME_BYTES 33
+
 typedef struct {
-        /** Volume name, to hold 16 latin-1 chars in UTF-8 and null terminator
-         * we need 2 * 16 + 1 bytes
-         */
-        char vol_name[33];
+        char vol_name[EXT4_VOL_NAME_BYTES];
 } ext4_fs_probe_info_t;