Changeset ff4f073 in mainline for uspace/srv/fs/ext2fs/ext2fs_ops.c

Timestamp:

2011-06-03T22:33:13Z (14 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.

File:

• uspace/srv/fs/ext2fs/ext2fs_ops.c (modified) (3 diffs)

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