X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=lwext4%2Fext4_mkfs.c;h=84f70405d3e3435311f46cdef2e80b1a06edae1e;hb=4bcfec78e66bb425cd8c8b865e7d8c950eecc069;hp=a3328984a38d55397d3cae15017bb7498c93e82f;hpb=b4f7056e3443f86eaf265ad2290c9862f7001d32;p=lwext4.git

diff --git a/lwext4/ext4_mkfs.c b/lwext4/ext4_mkfs.c
index a332898..84f7040 100644
--- a/lwext4/ext4_mkfs.c
+++ b/lwext4/ext4_mkfs.c
@@ -48,7 +48,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 +61,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)
@@ -82,15 +91,6 @@ static int sb2info(struct ext4_sblock *sb, struct ext4_mkfs_info *info)
 	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*/
-
-	return EOK;
-}
-
 static uint32_t compute_blocks_per_group(struct ext4_mkfs_info *info)
 {
 	return info->block_size * 8;
@@ -143,7 +143,15 @@ 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_FEATURE_RO_COMPAT_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;
@@ -163,8 +171,7 @@ static void create_fs_aux_info(struct fs_aux_info *aux_info, struct ext4_mkfs_in
 
 	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 +180,153 @@ 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, sizeof(struct ext4_sblock));
+	if (!aux_info->sb)
+		return ENOMEM;
 
+	aux_info->bg_desc = calloc(sizeof(struct ext4_bgroup),
+			aux_info->bg_desc_blocks);
+	if (!aux_info->bg_desc)
+		return ENOMEM;
+
+	aux_info->xattrs = NULL;
+	return EOK;
+}
 
-	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;
+static void release_fs_aux_info(struct fs_aux_info *aux_info)
+{
+	if (aux_info->sb)
+		free(aux_info->sb);
+	if (aux_info->sb)
+		free(aux_info->bg_desc);
+}
 
-	aux_info->bg_desc = calloc(info->block_size, aux_info->bg_desc_blocks);
-	ext4_assert(aux_info->bg_desc);
 
-	aux_info->xattrs = NULL;
+/* 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)
+{
+	unsigned int i;
+	struct ext4_sblock *sb = aux_info->sb;
+
+	sb->inodes_count = info->inodes_per_group * aux_info->groups;
+	sb->blocks_count_lo = aux_info->len_blocks;
+	sb->reserved_blocks_count_lo = 0;
+	sb->free_blocks_count_lo = 0;
+	sb->free_inodes_count = 0;
+	sb->first_data_block = aux_info->first_data_block;
+	sb->log_block_size = log_2(info->block_size / 1024);
+	sb->log_cluster_size = log_2(info->block_size / 1024);
+	sb->blocks_per_group = info->blocks_per_group;
+	sb->frags_per_group = info->blocks_per_group;
+	sb->inodes_per_group = info->inodes_per_group;
+	sb->mount_time = 0;
+	sb->write_time = 0;
+	sb->mount_count = 0;
+	sb->max_mount_count = 0xFFFF;
+	sb->magic = EXT4_SUPERBLOCK_MAGIC;
+	sb->state = EXT4_SUPERBLOCK_STATE_VALID_FS;
+	sb->errors = EXT4_SUPERBLOCK_ERRORS_RO;
+	sb->minor_rev_level = 0;
+	sb->last_check_time = 0;
+	sb->check_interval = 0;
+	sb->creator_os = EXT4_SUPERBLOCK_OS_LINUX;
+	sb->rev_level = 1;
+	sb->def_resuid = 0;
+	sb->def_resgid = 0;
+
+	sb->first_inode = EXT4_GOOD_OLD_FIRST_INO;
+	sb->inode_size = info->inode_size;
+	sb->block_group_index = 0;
+	sb->features_compatible = info->feat_compat;
+	sb->features_incompatible = info->feat_incompat;
+	sb->features_read_only = 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 = 0;
+
+	sb->s_reserved_gdt_blocks = info->bg_desc_reserve_blocks;
+	sb->s_prealloc_blocks = 0;
+	sb->s_prealloc_dir_blocks = 0;
+
+	//memcpy(sb->journal_uuid, sb->uuid, sizeof(sb->journal_uuid));
+	if (info->feat_compat & EXT4_FEATURE_COMPAT_HAS_JOURNAL)
+		sb->journal_inode_number = EXT4_JOURNAL_INO;
+	sb->journal_dev = 0;
+	sb->last_orphan = 0;
+	sb->hash_seed[0] = 0; /* FIXME */
+	sb->default_hash_version = EXT2_HTREE_HALF_MD4;
+	sb->reserved_char_pad = 1;
+	sb->desc_size = EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE;
+	sb->default_mount_opts = 0; /* FIXME */
+	sb->first_meta_bg = 0;
+	sb->mkfs_time = 0;
+	//sb->jnl_blocks[17]; /* FIXME */
+
+	sb->blocks_count_hi = aux_info->len_blocks >> 32;
+	sb->reserved_blocks_count_hi = 0;
+	sb->free_blocks_count_hi = 0;
+	sb->min_extra_isize = sizeof(struct ext4_inode) -
+		EXT4_GOOD_OLD_INODE_SIZE;
+	sb->want_extra_isize = sizeof(struct ext4_inode) -
+		EXT4_GOOD_OLD_INODE_SIZE;
+	sb->flags = 2;
+	sb->raid_stride = 0;
+	sb->mmp_interval = 0;
+	sb->mmp_block = 0;
+	sb->raid_stripe_width = 0;
+	sb->log_groups_per_flex = 0;
+	sb->kbytes_written = 0;
+
+	sb->block_group_index = 0;
+
+	for (i = 0; i < aux_info->groups; i++) {
+
+		uint64_t group_start_block = aux_info->first_data_block + i *
+			info->blocks_per_group;
+		uint32_t header_size = 0;
+
+		if (has_superblock(info, i))
+			header_size = 1 + aux_info->bg_desc_blocks + info->bg_desc_reserve_blocks;
+
+
+		aux_info->bg_desc[i].block_bitmap_lo = group_start_block + header_size;
+		aux_info->bg_desc[i].inode_bitmap_lo = group_start_block + header_size + 1;
+		aux_info->bg_desc[i].inode_table_first_block_lo = group_start_block + header_size + 2;
+
+		aux_info->bg_desc[i].free_blocks_count_lo = sb->blocks_per_group;
+		aux_info->bg_desc[i].free_inodes_count_lo = sb->inodes_per_group;
+		aux_info->bg_desc[i].used_dirs_count_lo = 0;
+	}
 }
 
+static int bdev_write_sb(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 = i;
+			r = ext4_block_writebytes(bd, offset, aux_info->sb, 1024);
+			if (r != EOK)
+				return r;
+		}
+	}
+
+	/* write out the primary superblock */
+	aux_info->sb->block_group_index = 0;
+	return ext4_block_writebytes(bd, 1024, aux_info->sb, 1024);
+}
 
 
 int ext4_mkfs_read_info(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
@@ -224,15 +358,10 @@ Finish:
 int ext4_mkfs(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
 {
 	int r;
-	struct ext4_sblock *sb = NULL;
 	r = ext4_block_init(bd);
 	if (r != EOK)
 		return r;
 
-	sb = malloc(sizeof(struct ext4_sblock));
-	if (!sb)
-		goto Finish;
-
 	if (info->len == 0)
 		info->len = bd->ph_bcnt * bd->ph_bsize;
 
@@ -268,20 +397,17 @@ int ext4_mkfs(struct ext4_blockdev *bd, struct ext4_mkfs_info *info)
 
 	info->bg_desc_reserve_blocks = compute_bg_desc_reserve_blocks(info);
 
-	r = info2sb(info, sb);
-	if (r != EOK)
-		return r;
-
 	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 "Size: %llu\n",
+			(long long unsigned int)info->len);
+	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,20 +415,28 @@ 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 "journal: %s\n",
 			!info->no_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);
+	memset(&aux_info, 0, sizeof(struct fs_aux_info));
+
+	r = create_fs_aux_info(&aux_info, info);
+	if (r != EOK)
+		goto Finish;
+
+	fill_in_sb(&aux_info, info);
 
-	/*TODO: write filesystem metadata*/
+
+	r = bdev_write_sb(bd, &aux_info, info);
+	if (r != EOK)
+		goto Finish;
 
 	Finish:
-	if (sb)
-		free(sb);
+	release_fs_aux_info(&aux_info);
 	ext4_block_fini(bd);
 	return r;
 }