Changeset 9104bb5 in mainline for uspace/lib/ext4/libext4_directory_index.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_directory_index.c (modified) (11 diffs)

uspace/lib/ext4/libext4_directory_index.c

@@ -189 +189 @@
 
 static int ext4_directory_dx_get_leaf(ext4_hash_info_t *hinfo,
-                ext4_filesystem_t *fs, ext4_inode_t *inode, block_t *root_block,
+                ext4_filesystem_t *fs, ext4_inode_ref_t *inode_ref, block_t *root_block,
                 ext4_directory_dx_block_t **dx_block, ext4_directory_dx_block_t *dx_blocks)
 {
@@ -239 +239 @@
 
         uint32_t fblock;
-        rc = ext4_filesystem_get_inode_data_block_index(fs, inode, next_block, &fblock);
+        rc = ext4_filesystem_get_inode_data_block_index(fs, inode_ref, next_block, &fblock);
         if (rc != EOK) {
                 return rc;
@@ -270 +270 @@
 
 
-static int ext4_directory_dx_next_block(ext4_filesystem_t *fs, ext4_inode_t *inode, uint32_t hash,
+static int ext4_directory_dx_next_block(ext4_filesystem_t *fs,
+                ext4_inode_ref_t *inode_ref, uint32_t hash,
                 ext4_directory_dx_block_t *handle, ext4_directory_dx_block_t *handles)
 {
@@ -309 +310 @@
         uint32_t block_idx = ext4_directory_dx_entry_get_block(p->position);
         uint32_t block_addr;
-        rc = ext4_filesystem_get_inode_data_block_index(fs, inode, block_idx, &block_addr);
+        rc = ext4_filesystem_get_inode_data_block_index(fs, inode_ref, block_idx, &block_addr);
         if (rc != EOK) {
                 return rc;
@@ -339 +340 @@
         // get direct block 0 (index root)
         uint32_t root_block_addr;
-        rc = ext4_filesystem_get_inode_data_block_index(fs, inode_ref->inode, 0, &root_block_addr);
+        rc = ext4_filesystem_get_inode_data_block_index(fs, inode_ref, 0, &root_block_addr);
         if (rc != EOK) {
                 return rc;
@@ -360 +361 @@
         ext4_directory_dx_block_t dx_blocks[2];
         ext4_directory_dx_block_t *dx_block, *tmp;
-        rc = ext4_directory_dx_get_leaf(&hinfo, fs, inode_ref->inode, root_block, &dx_block, dx_blocks);
+        rc = ext4_directory_dx_get_leaf(&hinfo, fs, inode_ref, root_block, &dx_block, dx_blocks);
         if (rc != EOK) {
                 block_put(root_block);
@@ -371 +372 @@
                 uint32_t leaf_block_idx = ext4_directory_dx_entry_get_block(dx_block->position);
                 uint32_t leaf_block_addr;
-        rc = ext4_filesystem_get_inode_data_block_index(fs, inode_ref->inode, leaf_block_idx, &leaf_block_addr);
+        rc = ext4_filesystem_get_inode_data_block_index(fs, inode_ref, leaf_block_idx, &leaf_block_addr);
         if (rc != EOK) {
                 goto cleanup;
@@ -399 +400 @@
                 }
 
-                rc = ext4_directory_dx_next_block(fs, inode_ref->inode, hinfo.hash, dx_block, &dx_blocks[0]);
+                rc = ext4_directory_dx_next_block(fs, inode_ref, hinfo.hash, dx_block, &dx_blocks[0]);
                 if (rc < 0) {
                         goto cleanup;
@@ -747 +748 @@
         // get direct block 0 (index root)
         uint32_t root_block_addr;
-        rc = ext4_filesystem_get_inode_data_block_index(fs, parent->inode, 0, &root_block_addr);
+        rc = ext4_filesystem_get_inode_data_block_index(fs, parent, 0, &root_block_addr);
         if (rc != EOK) {
                 return rc;
@@ -769 +770 @@
         ext4_directory_dx_block_t dx_blocks[2];
         ext4_directory_dx_block_t *dx_block, *dx_it;
-        rc = ext4_directory_dx_get_leaf(&hinfo, fs, parent->inode, root_block, &dx_block, dx_blocks);
+        rc = ext4_directory_dx_get_leaf(&hinfo, fs, parent, root_block, &dx_block, dx_blocks);
         if (rc != EOK) {
                 rc = EXT4_ERR_BAD_DX_DIR;
@@ -779 +780 @@
         uint32_t leaf_block_idx = ext4_directory_dx_entry_get_block(dx_block->position);
         uint32_t leaf_block_addr;
-        rc = ext4_filesystem_get_inode_data_block_index(fs, parent->inode, leaf_block_idx, &leaf_block_addr);
+        rc = ext4_filesystem_get_inode_data_block_index(fs, parent, leaf_block_idx, &leaf_block_addr);
         if (rc != EOK) {
                 goto release_index;