Changeset b209135 in mainline for uspace/lib/ext4/include

Timestamp:

2018-10-03T12:19:02Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba36a0

Parents:

2175178

git-author:

Jiri Svoboda <jiri@…> (2018-10-02 22:18:01)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-03 12:19:02)

Message:

Reading volume label from ext4 file system.

Location:

uspace/lib/ext4/include/ext4

Files:

• filesystem.h (modified) (1 diff)
• superblock.h (modified) (1 diff)
• types.h (modified) (1 diff)

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

@@ -41 +41 @@
 #include "ext4/types.h"
 
-extern errno_t ext4_filesystem_probe(service_id_t);
+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_open(ext4_instance_t *, service_id_t,

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

@@ -118 +118 @@
 extern void ext4_superblock_get_uuid(ext4_superblock_t *, uuid_t *);
 extern void ext4_superblock_set_uuid(ext4_superblock_t *, uuid_t *);
-extern const char *ext4_superblock_get_volume_name(ext4_superblock_t *);
+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 const char *ext4_superblock_get_last_mounted(ext4_superblock_t *);

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

@@ -235 +235 @@
 } ext4_filesystem_t;
 
+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];
+} ext4_fs_probe_info_t;
+
 #define EXT4_BLOCK_GROUP_INODE_UNINIT   0x0001  /* Inode table/bitmap not in use */
 #define EXT4_BLOCK_GROUP_BLOCK_UNINIT   0x0002  /* Block bitmap not in use */