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

Timestamp:

2011-10-31T15:21:09Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

a9a0982

Parents:

c83a55c

Message:

bugfix, TODO resolving

File:

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

uspace/lib/ext4/libext4_filesystem.c

@@ -127 +127 @@
 }
 
-// Feature checkers
-bool ext4_filesystem_has_feature_compatible(ext4_filesystem_t *fs, uint32_t feature)
-{
-        ext4_superblock_t *sb = fs->superblock;
-
-        if (ext4_superblock_get_features_compatible(sb) & feature) {
-                return true;
-        }
-        return false;
-}
-
-bool ext4_filesystem_has_feature_incompatible(ext4_filesystem_t *fs, uint32_t feature)
-{
-        ext4_superblock_t *sb = fs->superblock;
-
-        if (ext4_superblock_get_features_incompatible(sb) & feature) {
-                return true;
-        }
-        return false;
-}
-
-bool ext4_filesystem_has_feature_read_only(ext4_filesystem_t *fs, uint32_t feature)
-{
-        ext4_superblock_t *sb = fs->superblock;
-
-        if (ext4_superblock_get_features_read_only(sb) & feature) {
-                return true;
-        }
-        return false;
-}
-
-
 int ext4_filesystem_get_block_group_ref(ext4_filesystem_t *fs, uint32_t bgid,
     ext4_block_group_ref_t **ref)
@@ -173 +141 @@
         }
 
+        //EXT4FS_DBG("desc size = \%u", (uint32_t)ext4_superblock_get_desc_size(fs->superblock));
+
         descriptors_per_block = ext4_superblock_get_block_size(fs->superblock)
-            / EXT4_BLOCK_GROUP_DESCRIPTOR_SIZE;
+            / ext4_superblock_get_desc_size(fs->superblock);
 
         /* Block group descriptor table starts at the next block after superblock */
@@ -181 +151 @@
         /* 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;
+        offset = (bgid % descriptors_per_block) * ext4_superblock_get_desc_size(fs->superblock);
 
         rc = block_get(&newref->block, fs->device, block_id, 0);
@@ -302 +272 @@
 
         /* Handle inode using extents */
-        // TODO check "extents" feature in superblock ???
-        if (ext4_inode_has_flag(inode, EXT4_INODE_FLAG_EXTENTS)) {
+        if (ext4_superblock_has_feature_compatible(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);
                 *fblock = current_block;