Changeset 829d238 in mainline

Timestamp:

2011-10-10T18:55:04Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

6d52126b

Parents:

7b9381b

Message:

Basic extent structures + applied bugfix from M. Lombardi

Location:

uspace

Files:

• lib/ext4/Makefile (modified) (1 diff)
• lib/ext4/libext4.h (modified) (1 diff)
• lib/ext4/libext4_extent.c (added)
• lib/ext4/libext4_extent.h (added)
• lib/ext4/libext4_filesystem.c (modified) (2 diffs)
• lib/ext4/libext4_filesystem.h (modified) (1 diff)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)

uspace/lib/ext4/Makefile

@@ -35 +35 @@
         libext4_block_group.c \
         libext4_directory.c \
+        libext4_extent.c \
         libext4_filesystem.c \
         libext4_inode.c \

uspace/lib/ext4/libext4.h

@@ -36 +36 @@
 #include "libext4_block_group.h"
 #include "libext4_directory.h"
+#include "libext4_extent.h"
 #include "libext4_filesystem.h"
 #include "libext4_inode.h"

uspace/lib/ext4/libext4_filesystem.c

@@ -196 +196 @@
 }
 
+int ext4_filesystem_put_block_group_ref(ext4_block_group_ref_t *ref)
+{
+        int rc;
+
+        rc = block_put(ref->block);
+        free(ref);
+
+        return rc;
+}
+
 int ext4_filesystem_get_inode_ref(ext4_filesystem_t *fs, uint32_t index,
     ext4_inode_ref_t **ref)
@@ -235 +245 @@
             bg_ref->block_group);
 
+        rc = ext4_filesystem_put_block_group_ref(bg_ref);
+        if (rc != EOK) {
+                free(newref);
+                return rc;
+        }
+
         inode_size = ext4_superblock_get_inode_size(fs->superblock);
         block_size = ext4_superblock_get_block_size(fs->superblock);

uspace/lib/ext4/libext4_filesystem.h

@@ -109 +109 @@
 extern int ext4_filesystem_get_block_group_ref(ext4_filesystem_t *, uint32_t,
     ext4_block_group_ref_t **);
+extern int ext4_filesystem_put_block_group_ref(ext4_block_group_ref_t *);
 extern int ext4_filesystem_get_inode_ref(ext4_filesystem_t *, uint32_t,
                 ext4_inode_ref_t **);

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -833 +833 @@
         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,
                 inode_ref->inode);