#include "ext4_super.h"
#include "ext4_block_group.h"
#include "ext4_dir.h"
+#include "ext4_dir_idx.h"
#include "ext4_fs.h"
#include "ext4_inode.h"
#include "ext4_debug.h"
info->bg_desc_reserve_blocks = to_le16(sb->s_reserved_gdt_blocks);
info->label = sb->volume_name;
info->len = (uint64_t)info->block_size * ext4_sb_get_blocks_cnt(sb);
+ info->dsc_size = to_le16(sb->desc_size);
return EOK;
}
aux_info->blocks_per_dind * aux_info->blocks_per_dind;
aux_info->bg_desc_blocks =
- DIV_ROUND_UP(aux_info->groups * sizeof(struct ext4_bgroup),
+ DIV_ROUND_UP(aux_info->groups * info->dsc_size,
info->block_size);
aux_info->default_i_flags = EXT4_INODE_FLAG_NOATIME;
return ENOMEM;
aux_info->xattrs = NULL;
+
+
+ ext4_dbg(DEBUG_MKFS, DBG_INFO "create_fs_aux_info\n");
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "first_data_block: %"PRIu32"\n",
+ aux_info->first_data_block);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "len_blocks: %"PRIu64"\n",
+ aux_info->len_blocks);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "inode_table_blocks: %"PRIu32"\n",
+ aux_info->inode_table_blocks);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "groups: %"PRIu32"\n",
+ aux_info->groups);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "bg_desc_blocks: %"PRIu32"\n",
+ aux_info->bg_desc_blocks);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "default_i_flags: %"PRIu32"\n",
+ aux_info->default_i_flags);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "blocks_per_ind: %"PRIu32"\n",
+ aux_info->blocks_per_ind);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "blocks_per_dind: %"PRIu32"\n",
+ aux_info->blocks_per_dind);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "blocks_per_tind: %"PRIu32"\n",
+ aux_info->blocks_per_tind);
+
return EOK;
}
sb->journal_inode_number = to_le32(EXT4_JOURNAL_INO);
sb->journal_dev = to_le32(0);
sb->last_orphan = to_le32(0);
- memset(sb->hash_seed, 0, sizeof(sb->hash_seed));
+ sb->hash_seed[0] = to_le32(0x11111111);
+ sb->hash_seed[1] = to_le32(0x22222222);
+ sb->hash_seed[2] = to_le32(0x33333333);
+ sb->hash_seed[3] = to_le32(0x44444444);
sb->default_hash_version = EXT2_HTREE_HALF_MD4;
sb->checksum_type = 1;
- sb->desc_size = to_le16(EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE);
+ sb->desc_size = to_le16(info->dsc_size);
sb->default_mount_opts = to_le32(0);
sb->first_meta_bg = to_le32(0);
sb->mkfs_time = to_le32(0);
EXT4_GOOD_OLD_INODE_SIZE);
sb->want_extra_isize = to_le32(sizeof(struct ext4_inode) -
EXT4_GOOD_OLD_INODE_SIZE);
- sb->flags = to_le32(2);
+ sb->flags = to_le32(EXT4_SUPERBLOCK_FLAGS_SIGNED_HASH);
}
static void fill_bgroups(struct fs_aux_info *aux_info,
uint32_t blk_off = 0;
bg_free_blk = info->blocks_per_group -
- (aux_info->inode_table_blocks + aux_info->bg_desc_blocks);
+ aux_info->inode_table_blocks;
bg_free_blk -= 2;
blk_off += aux_info->bg_desc_blocks;
+ if (i == (aux_info->groups - 1))
+ bg_free_blk -= aux_info->first_data_block;
+
if (has_superblock(info, i)) {
bg_start_block++;
blk_off += info->bg_desc_reserve_blocks;
bg_free_blk -= info->bg_desc_reserve_blocks + 1;
- } else {
- bg_free_blk++;
+ bg_free_blk -= aux_info->bg_desc_blocks;
}
ext4_bg_set_block_bitmap(&aux_info->bg_desc[i], aux_info->sb,
struct ext4_block b;
for (i = 0; i < aux_info->groups; i++) {
uint64_t bg_start_block = aux_info->first_data_block +
- aux_info->first_data_block + i * info->blocks_per_group;
+ + i * info->blocks_per_group;
uint32_t blk_off = 0;
blk_off += aux_info->bg_desc_blocks;
if (r != EOK)
return r;
- while (dsc_pos + dsc_size < block_size) {
+ dsc_pos = 0;
+ while (dsc_pos + dsc_size <= block_size) {
memcpy(b.data + dsc_pos,
&aux_info->bg_desc[dsc_id],
dsc_size);
dsc_pos += dsc_size;
dsc_id++;
+
+ if (dsc_id == aux_info->groups)
+ break;
}
b.dirty = true;
r = ext4_block_set(bd, &b);
if (r != EOK)
return r;
+
+ if (dsc_id == aux_info->groups)
+ break;
}
r = ext4_block_get_noread(bd, &b, bg_start_block + blk_off + 1);
offset = info->block_size * (aux_info->first_data_block
+ i * info->blocks_per_group);
- aux_info->sb->block_group_index = i;
+ aux_info->sb->block_group_index = to_le16(i);
r = ext4_block_writebytes(bd, offset, aux_info->sb,
EXT4_SUPERBLOCK_SIZE);
if (r != EOK)
}
/* write out the primary superblock */
- aux_info->sb->block_group_index = 0;
+ aux_info->sb->block_group_index = to_le16(0);
return ext4_block_writebytes(bd, 1024, aux_info->sb,
EXT4_SUPERBLOCK_SIZE);
}
ext4_inode_set_mode(&fs->sb, root.inode,
EXT4_INODE_MODE_DIRECTORY | 0777);
- r = ext4_dir_add_entry(&root, ".", strlen("."), &root);
- if (r != EOK)
- return r;
+#if CONFIG_DIR_INDEX_ENABLE
+ /* Initialize directory index if supported */
+ if (ext4_sb_feature_com(&fs->sb, EXT4_FCOM_DIR_INDEX)) {
+ r = ext4_dir_dx_init(&root, &root);
+ if (r != EOK)
+ return r;
- r = ext4_dir_add_entry(&root, "..", strlen(".."), &root);
- if (r != EOK)
- return r;
+ r = ext4_dir_dx_init(&child, &root);
+ if (r != EOK)
+ return r;
- r = ext4_dir_add_entry(&child, ".", strlen("."), &child);
- if (r != EOK)
- return r;
+ ext4_inode_set_flag(root.inode, EXT4_INODE_FLAG_INDEX);
+ ext4_inode_set_flag(child.inode, EXT4_INODE_FLAG_INDEX);
+ } else
+#endif
+ {
+ r = ext4_dir_add_entry(&root, ".", strlen("."), &root);
+ if (r != EOK)
+ return r;
- r = ext4_dir_add_entry(&child, "..", strlen(".."), &root);
- if (r != EOK)
- return r;
+ r = ext4_dir_add_entry(&root, "..", strlen(".."), &root);
+ if (r != EOK)
+ return r;
+
+ r = ext4_dir_add_entry(&child, ".", strlen("."), &child);
+ if (r != EOK)
+ return r;
+
+ r = ext4_dir_add_entry(&child, "..", strlen(".."), &root);
+ if (r != EOK)
+ return r;
+ }
r = ext4_dir_add_entry(&root, "lost+found", strlen("lost+found"), &child);
if (r != EOK)
ext4_inode_set_links_count(root.inode, 3);
ext4_inode_set_links_count(child.inode, 2);
+ child.dirty = true;
+ root.dirty = true;
ext4_fs_put_inode_ref(&child);
ext4_fs_put_inode_ref(&root);
return r;
}
int ext4_mkfs(struct ext4_fs *fs, struct ext4_blockdev *bd,
- struct ext4_mkfs_info *info)
+ struct ext4_mkfs_info *info, int fs_type)
{
int r;
info->inodes_per_group = compute_inodes_per_group(info);
- info->feat_compat = EXT3_SUPPORTED_FCOM;
- info->feat_ro_compat = EXT3_SUPPORTED_FRO_COM;
- info->feat_incompat = EXT3_SUPPORTED_FINCOM;
+ switch (fs_type) {
+ case F_SET_EXT2:
+ info->feat_compat = EXT2_SUPPORTED_FCOM;
+ info->feat_ro_compat = EXT2_SUPPORTED_FRO_COM;
+ info->feat_incompat = EXT2_SUPPORTED_FINCOM;
+ break;
+ case F_SET_EXT3:
+ info->feat_compat = EXT3_SUPPORTED_FCOM;
+ info->feat_ro_compat = EXT3_SUPPORTED_FRO_COM;
+ info->feat_incompat = EXT3_SUPPORTED_FINCOM;
+ break;
+ case F_SET_EXT4:
+ info->feat_compat = EXT4_SUPPORTED_FCOM;
+ info->feat_ro_compat = EXT4_SUPPORTED_FRO_COM;
+ info->feat_incompat = EXT4_SUPPORTED_FINCOM;
+ break;
+ }
+ /*TODO: handle this features*/
info->feat_incompat &= ~EXT4_FINCOM_META_BG;
+ info->feat_incompat &= ~EXT4_FINCOM_FLEX_BG;
info->feat_ro_compat &= ~EXT4_FRO_COM_METADATA_CSUM;
- if (info->no_journal == 0)
+ /*TODO: handle journal feature & inode*/
+ if (info->journal == 0)
info->feat_compat |= 0;
+ if (info->dsc_size == 0) {
+
+ if (info->feat_incompat & EXT4_FINCOM_64BIT)
+ info->dsc_size = EXT4_MAX_BLOCK_GROUP_DESCRIPTOR_SIZE;
+ else
+ info->dsc_size = EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE;
+ }
+
info->bg_desc_reserve_blocks = 0;
ext4_dbg(DEBUG_MKFS, DBG_INFO "Creating filesystem with parameters:\n");
info->feat_incompat);
ext4_dbg(DEBUG_MKFS, DBG_NONE "BG desc reserve: %"PRIu32"\n",
info->bg_desc_reserve_blocks);
+ ext4_dbg(DEBUG_MKFS, DBG_NONE "Descriptor size: %"PRIu32"\n",
+ info->dsc_size);
ext4_dbg(DEBUG_MKFS, DBG_NONE "journal: %s\n",
- !info->no_journal ? "yes" : "no");
+ info->journal ? "yes" : "no");
ext4_dbg(DEBUG_MKFS, DBG_NONE "Label: %s\n", info->label);
struct ext4_bcache bc;
if (r != EOK)
goto cache_fini;
- r = ext4_block_cache_write_back(bd, 0);
+ r = ext4_block_cache_write_back(bd, 1);
if (r != EOK)
goto cache_fini;
ext4_fs_fini(fs);
cache_fini:
+ ext4_block_cache_write_back(bd, 0);
ext4_bcache_fini_dynamic(&bc);
block_fini:
projects / lwext4.git / blobdiff