Changeset ff4f073 in mainline

Timestamp:

2011-06-03T22:33:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

547c37a, 8d6c1f1

Parents:

5c96b2a (diff), 911ee54 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge ext2 fixes from ​http://ho.st.dcs.fmph.uniba.sk/~mato/bzr/helenos-ext2.

Location:

uspace

Files:

• app/ext2info/ext2info.c (modified) (2 diffs)
• lib/ext2/libext2_directory.c (modified) (7 diffs)
• lib/ext2/libext2_filesystem.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_directory.c

@@ -40 +40 @@
 #include <assert.h>
 
+static int ext2_directory_iterator_set(ext2_directory_iterator_t *it,
+    uint32_t block_size);
+
 /**
  * Get inode number for the directory entry
@@ -90 +93 @@
         int rc;
         uint32_t block_id;
+        uint32_t block_size;
+        
         it->inode_ref = inode_ref;
         it->fs = fs;
@@ -105 +110 @@
         }
         
-        it->current = it->current_block->data;
-        it->current_offset = 0;
-        
-        return EOK;
+        block_size = ext2_superblock_get_block_size(fs->superblock);
+        
+        it->current_offset = 0; 
+        return ext2_directory_iterator_set(it, block_size);
 }
 
@@ -126 +131 @@
         uint32_t next_block_phys_idx;
         uint32_t block_size;
-        uint32_t offset_in_block;
         
         assert(it->current != NULL);
@@ -175 +179 @@
         }
         
-        offset_in_block = (it->current_offset + skip) % block_size;
+        it->current_offset += skip;
+        return ext2_directory_iterator_set(it, block_size);
+}
+
+static int ext2_directory_iterator_set(ext2_directory_iterator_t *it,
+    uint32_t block_size)
+{
+        uint32_t offset_in_block = it->current_offset % block_size;
+        
+        it->current = NULL;
         
         /* Ensure proper alignment */
         if ((offset_in_block % 4) != 0) {
-                it->current = NULL;
                 return EIO;
         }
@@ -185 +197 @@
         /* Ensure that the core of the entry does not overflow the block */
         if (offset_in_block > block_size - 8) {
-                it->current = NULL;
-                return EIO;
-        }
-                
-        it->current = it->current_block->data + offset_in_block;
-        it->current_offset += skip;
+                return EIO;
+        }
+        
+        ext2_directory_entry_ll_t *entry = it->current_block->data + offset_in_block;
         
         /* Ensure that the whole entry does not overflow the block */
-        skip = ext2_directory_entry_ll_get_entry_length(it->current);
-        if (offset_in_block + skip > block_size) {
-                it->current = NULL;
+        uint16_t length = ext2_directory_entry_ll_get_entry_length(entry);
+        if (offset_in_block + length > block_size) {
                 return EIO;
         }
@@ -201 +210 @@
         /* Ensure the name length is not too large */
         if (ext2_directory_entry_ll_get_name_length(it->fs->superblock, 
-            it->current) > skip-8) {
-                it->current = NULL;
-                return EIO;
-        }
-        
+            entry) > length-8) {
+                return EIO;
+        }
+        
+        it->current = entry;
         return EOK;
 }

uspace/lib/ext2/libext2_filesystem.c

@@ -42 +42 @@
 #include <malloc.h>
 #include <assert.h>
+#include <byteorder.h>
 
 /**
@@ -369 +370 @@
                 
                 assert(offset_in_block < block_ids_per_block);
-                current_block = ((uint32_t*)block->data)[offset_in_block];
+                current_block = uint32_t_le2host(((uint32_t*)block->data)[offset_in_block]);
                 
                 rc = block_put(block);

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);