Revert "ext4: make sure blocks are not contaminated with data in block cache."
[lwext4.git] / lwext4 / ext4_mkfs.c
index a3328984a38d55397d3cae15017bb7498c93e82f..71cdce820c1e2369a00a5cc6b68f2a9836463f5d 100644 (file)
 
 #include "ext4_config.h"
 #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"
+#include "ext4_ialloc.h"
 #include "ext4_mkfs.h"
 
 #include <inttypes.h>
@@ -48,7 +54,6 @@
 
 struct fs_aux_info {
        struct ext4_sblock *sb;
-       struct ext4_sblock *sb_block;
        struct ext4_bgroup *bg_desc;
        struct xattr_list_element *xattrs;
        uint32_t first_data_block;
@@ -62,6 +67,16 @@ struct fs_aux_info {
        uint32_t blocks_per_tind;
 };
 
+static inline int log_2(int j)
+{
+       int i;
+
+       for (i = 0; j > 0; i++)
+               j >>= 1;
+
+       return i - 1;
+}
+
 static int sb2info(struct ext4_sblock *sb, struct ext4_mkfs_info *info)
 {
         if (to_le16(sb->magic) != EXT4_SUPERBLOCK_MAGIC)
@@ -78,15 +93,7 @@ static int sb2info(struct ext4_sblock *sb, struct ext4_mkfs_info *info)
        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);
-
-       return EOK;
-}
-
-static int info2sb(struct ext4_mkfs_info *info, struct ext4_sblock *sb)
-{
-       (void)info;
-       memset(sb, 0, sizeof(struct ext4_sblock));
-       /*TODO: Fill superblock with proper values*/
+       info->dsc_size = to_le16(sb->desc_size);
 
        return EOK;
 }
@@ -116,22 +123,6 @@ static uint32_t compute_inodes_per_group(struct ext4_mkfs_info *info)
        return inodes;
 }
 
-static uint32_t compute_bg_desc_reserve_blocks(struct ext4_mkfs_info *info)
-{
-       uint32_t blocks = DIV_ROUND_UP(info->len, info->block_size);
-       uint32_t block_groups = DIV_ROUND_UP(blocks, info->blocks_per_group);
-       uint32_t bg_desc_blocks = DIV_ROUND_UP(block_groups * sizeof(struct ext4_bgroup),
-                       info->block_size);
-
-       uint32_t bg_desc_reserve_blocks =
-                       DIV_ROUND_UP(block_groups * 1024 * sizeof(struct ext4_bgroup),
-                                       info->block_size) - bg_desc_blocks;
-
-       if (bg_desc_reserve_blocks > info->block_size / sizeof(uint32_t))
-               bg_desc_reserve_blocks = info->block_size / sizeof(uint32_t);
-
-       return bg_desc_reserve_blocks;
-}
 
 static uint32_t compute_journal_blocks(struct ext4_mkfs_info *info)
 {
@@ -143,28 +134,38 @@ static uint32_t compute_journal_blocks(struct ext4_mkfs_info *info)
        return journal_blocks;
 }
 
-static void create_fs_aux_info(struct fs_aux_info *aux_info, struct ext4_mkfs_info *info)
+static bool has_superblock(struct ext4_mkfs_info *info, uint32_t bgid)
+{
+       if (!(info->feat_ro_compat & EXT4_FRO_COM_SPARSE_SUPER))
+               return true;
+
+       return ext4_sb_sparse(bgid);
+}
+
+static int create_fs_aux_info(struct fs_aux_info *aux_info,
+                             struct ext4_mkfs_info *info)
 {
        aux_info->first_data_block = (info->block_size > 1024) ? 0 : 1;
        aux_info->len_blocks = info->len / info->block_size;
-       aux_info->inode_table_blocks = DIV_ROUND_UP(info->inodes_per_group * info->inode_size,
-               info->block_size);
-       aux_info->groups = DIV_ROUND_UP(aux_info->len_blocks - aux_info->first_data_block,
-               info->blocks_per_group);
+       aux_info->inode_table_blocks = DIV_ROUND_UP(info->inodes_per_group *
+                       info->inode_size, info->block_size);
+       aux_info->groups = DIV_ROUND_UP(aux_info->len_blocks -
+                       aux_info->first_data_block, info->blocks_per_group);
        aux_info->blocks_per_ind = info->block_size / sizeof(uint32_t);
-       aux_info->blocks_per_dind = aux_info->blocks_per_ind * aux_info->blocks_per_ind;
-       aux_info->blocks_per_tind = aux_info->blocks_per_dind * aux_info->blocks_per_dind;
+       aux_info->blocks_per_dind =
+                       aux_info->blocks_per_ind * aux_info->blocks_per_ind;
+       aux_info->blocks_per_tind =
+                       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;
 
        uint32_t last_group_size = aux_info->len_blocks % info->blocks_per_group;
        uint32_t last_header_size = 2 + aux_info->inode_table_blocks;
-       if (!(info->feat_ro_compat & EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER) ||
-                       ext4_sb_sparse(aux_info->groups - 1))
+       if (has_superblock(info, aux_info->groups - 1))
                last_header_size += 1 + aux_info->bg_desc_blocks +
                        info->bg_desc_reserve_blocks;
 
@@ -173,26 +174,283 @@ static void create_fs_aux_info(struct fs_aux_info *aux_info, struct ext4_mkfs_in
                aux_info->len_blocks -= last_group_size;
        }
 
-       /* The write_data* functions expect only block aligned calls.
-        * This is not an issue, except when we write out the super
-        * block on a system with a block size > 1K.  So, we need to
-        * deal with that here.
-        */
-       aux_info->sb_block = calloc(1, info->block_size);
-       ext4_assert(aux_info->sb_block);
+       aux_info->sb = calloc(1, EXT4_SUPERBLOCK_SIZE);
+       if (!aux_info->sb)
+               return ENOMEM;
+
+       aux_info->bg_desc = calloc(aux_info->groups, sizeof(struct ext4_bgroup));
+       if (!aux_info->bg_desc)
+               return ENOMEM;
 
+       aux_info->xattrs = NULL;
 
-       if (info->block_size > 1024)
-               aux_info->sb = (struct ext4_sblock *)((char *)aux_info->sb_block + 1024);
-       else
-               aux_info->sb = aux_info->sb_block;
 
-       aux_info->bg_desc = calloc(info->block_size, aux_info->bg_desc_blocks);
-       ext4_assert(aux_info->bg_desc);
+       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);
 
-       aux_info->xattrs = NULL;
+       return EOK;
 }
 
+static void release_fs_aux_info(struct fs_aux_info *aux_info)
+{
+       if (aux_info->sb)
+               free(aux_info->sb);
+       if (aux_info->bg_desc)
+               free(aux_info->bg_desc);
+}
+
+
+/* Fill in the superblock memory buffer based on the filesystem parameters */
+static void fill_in_sb(struct fs_aux_info *aux_info, struct ext4_mkfs_info *info)
+{
+       struct ext4_sblock *sb = aux_info->sb;
+
+       sb->inodes_count = to_le32(info->inodes_per_group * aux_info->groups);
+
+       ext4_sb_set_blocks_cnt(sb, aux_info->len_blocks);
+       ext4_sb_set_free_blocks_cnt(sb, aux_info->len_blocks);
+       sb->free_inodes_count = to_le32(info->inodes_per_group * aux_info->groups);
+
+       sb->reserved_blocks_count_lo = to_le32(0);
+       sb->first_data_block = to_le32(aux_info->first_data_block);
+       sb->log_block_size = to_le32(log_2(info->block_size / 1024));
+       sb->log_cluster_size = to_le32(log_2(info->block_size / 1024));
+       sb->blocks_per_group = to_le32(info->blocks_per_group);
+       sb->frags_per_group = to_le32(info->blocks_per_group);
+       sb->inodes_per_group = to_le32(info->inodes_per_group);
+       sb->mount_time = to_le32(0);
+       sb->write_time = to_le32(0);
+       sb->mount_count = to_le16(0);
+       sb->max_mount_count = to_le16(0xFFFF);
+       sb->magic = to_le16(EXT4_SUPERBLOCK_MAGIC);
+       sb->state = to_le16(EXT4_SUPERBLOCK_STATE_VALID_FS);
+       sb->errors = to_le16(EXT4_SUPERBLOCK_ERRORS_RO);
+       sb->minor_rev_level = to_le16(0);
+       sb->last_check_time = to_le32(0);
+       sb->check_interval = to_le32(0);
+       sb->creator_os = to_le32(EXT4_SUPERBLOCK_OS_LINUX);
+       sb->rev_level = to_le32(1);
+       sb->def_resuid = to_le16(0);
+       sb->def_resgid = to_le16(0);
+
+       sb->first_inode = to_le32(EXT4_GOOD_OLD_FIRST_INO);
+       sb->inode_size = to_le16(info->inode_size);
+       sb->block_group_index = to_le16(0);
+
+       sb->features_compatible = to_le32(info->feat_compat);
+       sb->features_incompatible = to_le32(info->feat_incompat);
+       sb->features_read_only = to_le32(info->feat_ro_compat);
+
+       memset(sb->uuid, 0, sizeof(sb->uuid));
+
+       memset(sb->volume_name, 0, sizeof(sb->volume_name));
+       strncpy(sb->volume_name, info->label, sizeof(sb->volume_name));
+       memset(sb->last_mounted, 0, sizeof(sb->last_mounted));
+
+       sb->algorithm_usage_bitmap = to_le32(0);
+       sb->s_prealloc_blocks = 0;
+       sb->s_prealloc_dir_blocks = 0;
+       sb->s_reserved_gdt_blocks = to_le16(info->bg_desc_reserve_blocks);
+
+       if (info->feat_compat & EXT4_FCOM_HAS_JOURNAL)
+               sb->journal_inode_number = to_le32(EXT4_JOURNAL_INO);
+       sb->journal_dev = to_le32(0);
+       sb->last_orphan = to_le32(0);
+       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(info->dsc_size);
+       sb->default_mount_opts = to_le32(0);
+       sb->first_meta_bg = to_le32(0);
+       sb->mkfs_time = to_le32(0);
+
+       sb->reserved_blocks_count_hi = to_le32(0);
+       sb->min_extra_isize = to_le32(sizeof(struct ext4_inode) -
+               EXT4_GOOD_OLD_INODE_SIZE);
+       sb->want_extra_isize = to_le32(sizeof(struct ext4_inode) -
+               EXT4_GOOD_OLD_INODE_SIZE);
+       sb->flags = to_le32(EXT4_SUPERBLOCK_FLAGS_SIGNED_HASH);
+}
+
+static void fill_bgroups(struct fs_aux_info *aux_info,
+                        struct ext4_mkfs_info *info)
+{
+       uint32_t i;
+
+       uint64_t bg_free_blk = 0;
+       uint64_t sb_free_blk = 0;
+
+       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;
+               uint32_t blk_off = 0;
+
+               bg_free_blk = info->blocks_per_group -
+                               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;
+                       bg_free_blk -= aux_info->bg_desc_blocks;
+               }
+
+               ext4_bg_set_block_bitmap(&aux_info->bg_desc[i], aux_info->sb,
+                               bg_start_block + blk_off + 1);
+
+               ext4_bg_set_inode_bitmap(&aux_info->bg_desc[i], aux_info->sb,
+                               bg_start_block + blk_off + 2);
+
+               ext4_bg_set_inode_table_first_block(&aux_info->bg_desc[i],
+                               aux_info->sb,
+                               bg_start_block + blk_off + 3);
+
+               ext4_bg_set_free_blocks_count(&aux_info->bg_desc[i],
+                               aux_info->sb, bg_free_blk);
+
+               ext4_bg_set_free_inodes_count(&aux_info->bg_desc[i],
+                               aux_info->sb, aux_info->sb->inodes_per_group);
+
+               ext4_bg_set_used_dirs_count(&aux_info->bg_desc[i], aux_info->sb,
+                                           0);
+
+               ext4_bg_set_flag(&aux_info->bg_desc[i],
+                               EXT4_BLOCK_GROUP_BLOCK_UNINIT |
+                               EXT4_BLOCK_GROUP_INODE_UNINIT);
+
+               sb_free_blk += bg_free_blk;
+       }
+
+       ext4_sb_set_free_blocks_cnt(aux_info->sb, sb_free_blk);
+}
+
+
+static int write_bgroups(struct ext4_blockdev *bd, struct fs_aux_info *aux_info,
+                        struct ext4_mkfs_info *info)
+{
+       int r;
+       uint32_t i;
+       struct ext4_block b;
+       for (i = 0; i < aux_info->groups; i++) {
+               uint64_t bg_start_block = aux_info->first_data_block +
+                       + i * info->blocks_per_group;
+               uint32_t blk_off = 0;
+
+               blk_off += aux_info->bg_desc_blocks;
+               if (has_superblock(info, i)) {
+                       bg_start_block++;
+                       blk_off += info->bg_desc_reserve_blocks;
+               }
+
+               uint32_t block_size = ext4_sb_get_block_size(aux_info->sb);
+               uint32_t dsc_pos = 0;
+               uint32_t dsc_id = 0;
+               uint32_t dsc_size = ext4_sb_get_desc_size(aux_info->sb);
+               uint32_t dsc_blk_cnt = aux_info->bg_desc_blocks;
+               uint64_t dsc_blk = bg_start_block;
+
+               while (dsc_blk_cnt--) {
+                       r = ext4_block_get(bd, &b, dsc_blk++);
+                       if (r != EOK)
+                               return r;
+
+                       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;
+                       }
+
+                       ext4_bcache_set_dirty(b.buf);
+                       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);
+               if (r != EOK)
+                       return r;
+               memset(b.data, 0, block_size);
+               ext4_bcache_set_dirty(b.buf);
+               r = ext4_block_set(bd, &b);
+               if (r != EOK)
+                       return r;
+               r = ext4_block_get_noread(bd, &b, bg_start_block + blk_off + 2);
+               if (r != EOK)
+                       return r;
+               memset(b.data, 0, block_size);
+               ext4_bcache_set_dirty(b.buf);
+               r = ext4_block_set(bd, &b);
+               if (r != EOK)
+                       return r;
+       }
+
+
+       return r;
+}
+
+static int write_sblocks(struct ext4_blockdev *bd, struct fs_aux_info *aux_info,
+                         struct ext4_mkfs_info *info)
+{
+       uint64_t offset;
+       uint32_t i;
+       int r;
+
+       /* write out the backup superblocks */
+       for (i = 1; i < aux_info->groups; i++) {
+               if (has_superblock(info, i)) {
+                       offset = info->block_size * (aux_info->first_data_block
+                               + i * info->blocks_per_group);
+
+                       aux_info->sb->block_group_index = to_le16(i);
+                       r = ext4_block_writebytes(bd, offset, aux_info->sb,
+                                                 EXT4_SUPERBLOCK_SIZE);
+                       if (r != EOK)
+                               return r;
+               }
+       }
+
+       /* write out the primary superblock */
+       aux_info->sb->block_group_index = to_le16(0);
+       return ext4_block_writebytes(bd, 1024, aux_info->sb,
+                       EXT4_SUPERBLOCK_SIZE);
+}
 
 
 int ext4_mkfs_read_info(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
@@ -203,7 +461,7 @@ int ext4_mkfs_read_info(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
        if (r != EOK)
                return r;
 
-       sb = malloc(sizeof(struct ext4_sblock));
+       sb = malloc(EXT4_SUPERBLOCK_SIZE);
        if (!sb)
                goto Finish;
 
@@ -221,20 +479,155 @@ Finish:
        return r;
 }
 
-int ext4_mkfs(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
+static int mkfs_initial(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
 {
        int r;
-       struct ext4_sblock *sb = NULL;
-       r = ext4_block_init(bd);
+       struct fs_aux_info aux_info;
+       memset(&aux_info, 0, sizeof(struct fs_aux_info));
+
+       r = create_fs_aux_info(&aux_info, info);
        if (r != EOK)
-               return r;
+               goto Finish;
 
-       sb = malloc(sizeof(struct ext4_sblock));
-       if (!sb)
+       fill_in_sb(&aux_info, info);
+       fill_bgroups(&aux_info, info);
+
+
+       r = write_bgroups(bd, &aux_info, info);
+       if (r != EOK)
+               goto Finish;
+
+       r = write_sblocks(bd, &aux_info, info);
+       if (r != EOK)
                goto Finish;
 
+       Finish:
+       release_fs_aux_info(&aux_info);
+       return r;
+}
+
+static int init_bgs(struct ext4_fs *fs)
+{
+       int r = EOK;
+       struct ext4_block_group_ref ref;
+       uint32_t i;
+       uint32_t bg_count = ext4_block_group_cnt(&fs->sb);
+       for (i = 0; i < bg_count; ++i) {
+               r = ext4_fs_get_block_group_ref(fs, i, &ref);
+               if (r != EOK)
+                       break;
+
+               r = ext4_fs_put_block_group_ref(&ref);
+               if (r != EOK)
+                       break;
+       }
+       return r;
+}
+
+static int alloc_inodes(struct ext4_fs *fs)
+{
+       int r = EOK;
+       int i;
+       struct ext4_inode_ref inode_ref;
+       for (i = 1; i < 12; ++i) {
+               int filetype = EXT4_DE_REG_FILE;
+
+               switch (i) {
+               case EXT4_ROOT_INO:
+               case EXT4_GOOD_OLD_FIRST_INO:
+                       filetype = EXT4_DE_DIR;
+                       break;
+               }
+
+               r = ext4_fs_alloc_inode(fs, &inode_ref, filetype);
+               if (r != EOK)
+                       return r;
+
+               ext4_inode_set_mode(&fs->sb, inode_ref.inode, 0);
+               ext4_fs_put_inode_ref(&inode_ref);
+       }
+
+       return r;
+}
+
+static int create_dirs(struct ext4_fs *fs)
+{
+       int r = EOK;
+       struct ext4_inode_ref root;
+       struct ext4_inode_ref child;
+
+       r = ext4_fs_get_inode_ref(fs, EXT4_ROOT_INO, &root);
+       if (r != EOK)
+               return r;
+
+       r = ext4_fs_get_inode_ref(fs, EXT4_GOOD_OLD_FIRST_INO, &child);
+       if (r != EOK)
+               return r;
+
+       ext4_inode_set_mode(&fs->sb, child.inode,
+                       EXT4_INODE_MODE_DIRECTORY | 0777);
+
+       ext4_inode_set_mode(&fs->sb, root.inode,
+                       EXT4_INODE_MODE_DIRECTORY | 0777);
+
+#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_dx_init(&child, &root);
+               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(&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)
+               return r;
+
+       ext4_inode_set_links_cnt(root.inode, 3);
+       ext4_inode_set_links_cnt(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, int fs_type)
+{
+       int r;
+
+       r = ext4_block_init(bd);
+       if (r != EOK)
+               return r;
+
        if (info->len == 0)
-               info->len = bd->ph_bcnt * bd->ph_bsize;
+               info->len = bd->bdif->ph_bcnt * bd->bdif->ph_bsize;
 
        if (info->block_size == 0)
                info->block_size = 4096; /*Set block size to default value*/
@@ -259,29 +652,55 @@ int ext4_mkfs(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
 
        info->inodes_per_group = compute_inodes_per_group(info);
 
-       info->feat_compat = CONFIG_FEATURE_COMPAT_SUPP;
-       info->feat_ro_compat = CONFIG_FEATURE_RO_COMPAT_SUPP;
-       info->feat_incompat = CONFIG_FEATURE_INCOMPAT_SUPP;
+       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;
+       }
 
-       if (info->no_journal == 0)
-               info->feat_compat |= EXT4_FEATURE_COMPAT_HAS_JOURNAL;
+       /*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;
 
-       info->bg_desc_reserve_blocks = compute_bg_desc_reserve_blocks(info);
+       /*TODO: handle journal feature & inode*/
+       if (info->journal == 0)
+               info->feat_compat |= 0;
 
-       r = info2sb(info, sb);
-       if (r != EOK)
-               return r;
+       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");
        ext4_dbg(DEBUG_MKFS, DBG_NONE "Size: %"PRIu64"\n", info->len);
-       ext4_dbg(DEBUG_MKFS, DBG_NONE "Block size: %d\n", info->block_size);
-       ext4_dbg(DEBUG_MKFS, DBG_NONE "Blocks per group: %d\n",
+       ext4_dbg(DEBUG_MKFS, DBG_NONE "Block size: %"PRIu32"\n",
+                       info->block_size);
+       ext4_dbg(DEBUG_MKFS, DBG_NONE "Blocks per group: %"PRIu32"\n",
                        info->blocks_per_group);
-       ext4_dbg(DEBUG_MKFS, DBG_NONE "Inodes per group: %d\n",
+       ext4_dbg(DEBUG_MKFS, DBG_NONE "Inodes per group: %"PRIu32"\n",
                        info->inodes_per_group);
-       ext4_dbg(DEBUG_MKFS, DBG_NONE "Inode size: %d\n", info->inode_size);
-       ext4_dbg(DEBUG_MKFS, DBG_NONE "Inodes: %d\n", info->inodes);
-       ext4_dbg(DEBUG_MKFS, DBG_NONE "Journal blocks: %d\n",
+       ext4_dbg(DEBUG_MKFS, DBG_NONE "Inode size: %"PRIu32"\n",
+                       info->inode_size);
+       ext4_dbg(DEBUG_MKFS, DBG_NONE "Inodes: %"PRIu32"\n", info->inodes);
+       ext4_dbg(DEBUG_MKFS, DBG_NONE "Journal blocks: %"PRIu32"\n",
                        info->journal_blocks);
        ext4_dbg(DEBUG_MKFS, DBG_NONE "Features ro_compat: 0x%x\n",
                        info->feat_ro_compat);
@@ -289,21 +708,61 @@ int ext4_mkfs(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
                        info->feat_compat);
        ext4_dbg(DEBUG_MKFS, DBG_NONE "Features incompat: 0x%x\n",
                        info->feat_incompat);
-       ext4_dbg(DEBUG_MKFS, DBG_NONE "BG desc reserve: 0x%x\n",
+       ext4_dbg(DEBUG_MKFS, DBG_NONE "BG desc reserve: %"PRIu32"\n",
                        info->bg_desc_reserve_blocks);
+       ext4_dbg(DEBUG_MKFS, DBG_NONE "Descriptor size: %"PRIu16"\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 fs_aux_info aux_info;
-       create_fs_aux_info(&aux_info, info);
+       struct ext4_bcache bc;
+       memset(&bc, 0, sizeof(struct ext4_bcache));
+       ext4_block_set_lb_size(bd, info->block_size);
+       r = ext4_bcache_init_dynamic(&bc, CONFIG_BLOCK_DEV_CACHE_SIZE,
+                                     info->block_size);
+       if (r != EOK)
+               goto block_fini;
 
-       /*TODO: write filesystem metadata*/
+       /*Bind block cache to block device*/
+       r = ext4_block_bind_bcache(bd, &bc);
+       if (r != EOK)
+               goto cache_fini;
 
-       Finish:
-       if (sb)
-               free(sb);
+       r = ext4_block_cache_write_back(bd, 1);
+       if (r != EOK)
+               goto cache_fini;
+
+       r = mkfs_initial(bd, info);
+       if (r != EOK)
+               goto cache_fini;
+
+       r = ext4_fs_init(fs, bd);
+       if (r != EOK)
+               goto cache_fini;
+
+       r = init_bgs(fs);
+       if (r != EOK)
+               goto fs_fini;
+
+       r = alloc_inodes(fs);
+       if (r != EOK)
+               goto fs_fini;
+
+       r = create_dirs(fs);
+       if (r != EOK)
+               goto fs_fini;
+
+       fs_fini:
+       ext4_fs_fini(fs);
+
+       cache_fini:
+       ext4_block_cache_write_back(bd, 0);
+       ext4_bcache_fini_dynamic(&bc);
+
+       block_fini:
        ext4_block_fini(bd);
+
        return r;
 }