Changeset 82a3b31f in mainline

Timestamp:

2011-06-03T20:25:10Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

d7c3367

Parents:

21300a2

Message:

Fix ext2 on big-endian machines

Location:

uspace

Files:

• app/ext2info/ext2info.c (modified) (2 diffs)
• lib/ext2/libext2_superblock.c (modified) (1 diff)
• srv/fs/ext2fs/ext2fs_ops.c (modified) (3 diffs)

uspace/app/ext2info/ext2info.c

@@ -586 +586 @@
         ext2_directory_iterator_t it;
         size_t name_size;
+        uint32_t inode;
         
         printf("  Directory contents:\n");
@@ -600 +601 @@
                 printf("    ");
                 print_data(&it.current->name, name_size);
-                printf(" --> %u\n", it.current->inode);
+                
+                inode = ext2_directory_entry_ll_get_inode(it.current);
+                printf(" --> %u\n", inode);
                 
                 rc = ext2_directory_iterator_next(&it);

uspace/lib/ext2/libext2_superblock.c

@@ -184 +184 @@
                 return EXT2_REV0_INODE_SIZE;
         }
-        return uint32_t_le2host(sb->inode_size);
+        return uint16_t_le2host(sb->inode_size);
 }
 

uspace/srv/fs/ext2fs/ext2fs_ops.c

@@ -232 +232 @@
         size_t component_size;
         bool found = false;
+        uint32_t inode;
         
         fs = eparent->instance->filesystem;
@@ -254 +255 @@
         
         while (it.current != NULL) {
+                inode = ext2_directory_entry_ll_get_inode(it.current);
+                
                 /* ignore empty directory entries */
-                if (it.current->inode != 0) {
+                if (inode != 0) {
                         name_size = ext2_directory_entry_ll_get_name_length(fs->superblock,
                                 it.current);
@@ -262 +265 @@
                                     name_size) == 0) {
                                 rc = ext2fs_node_get_core(rfn, eparent->instance,
-                                        it.current->inode);
+                                        inode);
                                 if (rc != EOK) {
                                         ext2_directory_iterator_fini(&it);