Changeset e68c834 in mainline for uspace/lib/ext4/libext4_filesystem.c

Timestamp:

2011-10-10T06:48:16Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

7a68fe5

Parents:

1114173

Message:

More functions ported from ext2

File:

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

uspace/lib/ext4/libext4_filesystem.c

@@ -41 +41 @@
 #include "libext4.h"
 
-/**
- * TODO doxy
- */
 int ext4_filesystem_init(ext4_filesystem_t *fs, service_id_t service_id)
 {
@@ -86 +83 @@
 }
 
-/**
- * TODO doxy
- */
 void ext4_filesystem_fini(ext4_filesystem_t *fs)
 {
@@ -95 +89 @@
 }
 
-/**
- * TODO doxy
- */
 int ext4_filesystem_check_sanity(ext4_filesystem_t *fs)
 {
@@ -110 +101 @@
 }
 
-/**
- * TODO doxy
- */
 int ext4_filesystem_check_features(ext4_filesystem_t *fs, bool *o_read_only)
 {
@@ -139 +127 @@
 }
 
-/**
- * TODO doxy
- */
 int ext4_filesystem_get_block_group_ref(ext4_filesystem_t *fs, uint32_t bgid,
     ext4_block_group_ref_t **ref)
 {
-        EXT4FS_DBG("");
-
         int rc;
         aoff64_t block_id;
@@ -164 +147 @@
         block_id = ext4_superblock_get_first_data_block(fs->superblock) + 1;
 
-        EXT4FS_DBG("block_size = \%d", ext4_superblock_get_block_size(fs->superblock));
-        EXT4FS_DBG("descriptors_per_block = \%d", descriptors_per_block);
-        EXT4FS_DBG("bgid = \%d", bgid);
-        EXT4FS_DBG("first_data_block: \%d", (uint32_t)block_id);
-
         /* Find the block containing the descriptor we are looking for */
         block_id += bgid / descriptors_per_block;
         offset = (bgid % descriptors_per_block) * EXT4_BLOCK_GROUP_DESCRIPTOR_SIZE;
 
-        EXT4FS_DBG("updated block_id: \%d", (uint32_t)block_id);
-
         rc = block_get(&newref->block, fs->device, block_id, 0);
         if (rc != EOK) {
-
-                EXT4FS_DBG("block_get error: \%d", rc);
-
                 free(newref);
                 return rc;
         }
 
-        EXT4FS_DBG("block read");
-
         newref->block_group = newref->block->data + offset;
 
         *ref = newref;
 
-        EXT4FS_DBG("finished");
-
-        return EOK;
-}
-
-/**
- * TODO doxy
- */
+        return EOK;
+}
+
 int ext4_filesystem_get_inode_ref(ext4_filesystem_t *fs, uint32_t index,
     ext4_inode_ref_t **ref)
 {
-        EXT4FS_DBG("");
-
         int rc;
         aoff64_t block_id;
@@ -221 +185 @@
         }
 
-        EXT4FS_DBG("allocated");
-
         inodes_per_group = ext4_superblock_get_inodes_per_group(fs->superblock);
-
-        EXT4FS_DBG("inodes_per_group_loaded");
 
         /* inode numbers are 1-based, but it is simpler to work with 0-based
@@ -234 +194 @@
         offset_in_group = index % inodes_per_group;
 
-        EXT4FS_DBG("index: \%d", index);
-        EXT4FS_DBG("inodes_per_group: \%d", inodes_per_group);
-        EXT4FS_DBG("bg_id: \%d", block_group);
-
         rc = ext4_filesystem_get_block_group_ref(fs, block_group, &bg_ref);
         if (rc != EOK) {
@@ -243 +199 @@
                 return rc;
         }
-
-        EXT4FS_DBG("block_group_ref loaded");
 
         inode_table_start = ext4_block_group_get_inode_table_first_block(
             bg_ref->block_group);
 
-        EXT4FS_DBG("inode_table block loaded");
-
         inode_size = ext4_superblock_get_inode_size(fs->superblock);
         block_size = ext4_superblock_get_block_size(fs->superblock);
@@ -259 +211 @@
         offset_in_block = byte_offset_in_group % block_size;
 
-        EXT4FS_DBG("superblock info loaded");
-
         rc = block_get(&newref->block, fs->device, block_id, 0);
         if (rc != EOK) {
@@ -266 +216 @@
                 return rc;
         }
-
-        EXT4FS_DBG("block got");
 
         newref->inode = newref->block->data + offset_in_block;
@@ -277 +225 @@
         *ref = newref;
 
-        EXT4FS_DBG("finished");
-
-        return EOK;
-}
+        return EOK;
+}
+
 
 int ext4_filesystem_put_inode_ref(ext4_inode_ref_t *ref)
@@ -307 +254 @@
 
         /* Handle simple case when we are dealing with direct reference */
-        if (iblock < EXT4_INODE_DIRECT_BLOCKS) {
+        if (iblock < EXT4_INODE_DIRECT_BLOCK_COUNT) {
                 current_block = ext4_inode_get_direct_block(inode, (uint32_t)iblock);
                 *fblock = current_block;
@@ -317 +264 @@
          */
         block_ids_per_block = ext4_superblock_get_block_size(fs->superblock) / sizeof(uint32_t);
-        limits[0] = EXT4_INODE_DIRECT_BLOCKS;
+        limits[0] = EXT4_INODE_DIRECT_BLOCK_COUNT;
         blocks_per_level[0] = 1;
         for (i = 1; i < 4; i++) {