Changeset 8958a26 in mainline for uspace/srv/fs/ext4fs/ext4fs_ops.c

Timestamp:

2011-10-11T19:06:10Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1a7756a

Parents:

acd869e

Message:

Extent reading (only with zero depth)

File:

• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (5 diffs)

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -718 +718 @@
 
         ext4_filesystem_put_inode_ref(inode_ref);
+
         return rc;
 }
 
-bool ext4fs_is_dots(const uint8_t *name, size_t name_size) {
+bool ext4fs_is_dots(const uint8_t *name, size_t name_size)
+{
         if (name_size == 1 && name[0] == '.') {
                 return true;
@@ -745 +747 @@
 
         // TODO check if directory uses HTree
-        if (ext4_filesystem_has_feature_compatible(inst->filesystem, EXT4_FEATURE_COMPAT_DIR_INDEX)
-                        && ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_INDEX)) {
+        if (ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_INDEX)) {
                 EXT4FS_DBG("Directory using HTree");
         }
@@ -802 +803 @@
         if (found) {
                 rc = ext4_directory_iterator_next(&it);
-                if (rc != EOK)
+                if (rc != EOK) {
                         return rc;
+                }
                 next = it.current_offset;
         }
 
         rc = ext4_directory_iterator_fini(&it);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                return rc;
+        }
 
         if (found) {
@@ -832 +835 @@
         block_t *block;
         uint8_t *buffer;
-
-        // TODO Check extent
-        if (ext4_filesystem_has_feature_incompatible(inst->filesystem, EXT4_FEATURE_INCOMPAT_EXTENTS)
-                        && ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS)) {
-                EXT4FS_DBG("Extent found");
-        }
 
         file_size = ext4_inode_get_size(inst->filesystem->superblock,
@@ -901 +898 @@
 
         rc = block_put(block);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                return rc;
+        }
 
         *rbytes = bytes;