Changeset 9104bb5 in mainline for uspace/lib/ext4/libext4_filesystem.c

Timestamp:

2012-03-20T20:22:19Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

a4419e7

Parents:

cd581120

Message:

changes according to reading inode data with extent

File:

• uspace/lib/ext4/libext4_filesystem.c (modified) (2 diffs)

uspace/lib/ext4/libext4_filesystem.c

@@ -494 +494 @@
 }
 
-int ext4_filesystem_get_inode_data_block_index(ext4_filesystem_t *fs, ext4_inode_t* inode,
-    aoff64_t iblock, uint32_t* fblock)
+int ext4_filesystem_get_inode_data_block_index(ext4_filesystem_t *fs,
+                ext4_inode_ref_t *inode_ref, aoff64_t iblock, uint32_t* fblock)
 {
         int rc;
@@ -504 +504 @@
         /* Handle inode using extents */
         if (ext4_superblock_has_feature_incompatible(fs->superblock, EXT4_FEATURE_INCOMPAT_EXTENTS) &&
-                        ext4_inode_has_flag(inode, EXT4_INODE_FLAG_EXTENTS)) {
-                current_block = ext4_inode_get_extent_block(inode, iblock, fs->device);
+                        ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS)) {
+                rc = ext4_extent_find_block(fs, inode_ref, iblock, &current_block);
+
+                if (rc != EOK) {
+                        return rc;
+                }
+
                 *fblock = current_block;
                 return EOK;
 
         }
+
+        ext4_inode_t *inode = inode_ref->inode;
 
         /* Handle simple case when we are dealing with direct reference */