Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f18a5f21 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: use ext4_kvzalloc()/ext4_kvmalloc() for s_group_desc and s_group_info 



Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 9933fc0a

fs/ext4/mballoc.c

+3 −3
Original line number Diff line number Diff line
@@ -2331,7 +2331,7 @@ static int ext4_mb_init_backend(struct super_block *sb) 
	/* An 8TB filesystem with 64-bit pointers requires a 4096 byte

	 * kmalloc. A 128kb malloc should suffice for a 256TB filesystem.

	 * So a two level scheme suffices for now. */

	sbi->s_group_info = kzalloc(array_size, GFP_KERNEL);

	sbi->s_group_info = ext4_kvzalloc(array_size, GFP_KERNEL);

	if (sbi->s_group_info == NULL) {

		printk(KERN_ERR "EXT4-fs: can't allocate buddy meta group\n");

		return -ENOMEM;
@@ -2365,7 +2365,7 @@ static int ext4_mb_init_backend(struct super_block *sb) 
		kfree(sbi->s_group_info[i]);

	iput(sbi->s_buddy_cache);

err_freesgi:

	kfree(sbi->s_group_info);

	ext4_kvfree(sbi->s_group_info);

	return -ENOMEM;

}
@@ -2559,7 +2559,7 @@ int ext4_mb_release(struct super_block *sb) 
			EXT4_DESC_PER_BLOCK_BITS(sb);

		for (i = 0; i < num_meta_group_infos; i++)

			kfree(sbi->s_group_info[i]);

		kfree(sbi->s_group_info);

		ext4_kvfree(sbi->s_group_info);

	}

	kfree(sbi->s_mb_offsets);

	kfree(sbi->s_mb_maxs);

fs/ext4/resize.c

+7 −6
Original line number Diff line number Diff line
@@ -467,12 +467,13 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
	if (unlikely(err))

		goto exit_dindj;



	n_group_desc = kmalloc((gdb_num + 1) * sizeof(struct buffer_head *),

	n_group_desc = ext4_kvmalloc((gdb_num + 1) *

				     sizeof(struct buffer_head *),

				     GFP_NOFS);

	if (!n_group_desc) {

		err = -ENOMEM;

		ext4_warning(sb,

			      "not enough memory for %lu groups", gdb_num + 1);

		ext4_warning(sb, "not enough memory for %lu groups",

			     gdb_num + 1);

		goto exit_inode;

	}
@@ -507,7 +508,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
	n_group_desc[gdb_num] = gdb_bh;

	EXT4_SB(sb)->s_group_desc = n_group_desc;

	EXT4_SB(sb)->s_gdb_count++;

	kfree(o_group_desc);

	ext4_kvfree(o_group_desc);



	le16_add_cpu(&es->s_reserved_gdt_blocks, -1);

	err = ext4_handle_dirty_metadata(handle, NULL, EXT4_SB(sb)->s_sbh);
@@ -517,7 +518,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
	return err;



exit_inode:

	kfree(n_group_desc);

	ext4_kvfree(n_group_desc);

	/* ext4_handle_release_buffer(handle, iloc.bh); */

	brelse(iloc.bh);

exit_dindj:

fs/ext4/super.c

+5 −4
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static void ext4_put_super(struct super_block *sb) 


	for (i = 0; i < sbi->s_gdb_count; i++)

		brelse(sbi->s_group_desc[i]);

	kfree(sbi->s_group_desc);

	ext4_kvfree(sbi->s_group_desc);

	ext4_kvfree(sbi->s_flex_groups);

	percpu_counter_destroy(&sbi->s_freeblocks_counter);

	percpu_counter_destroy(&sbi->s_freeinodes_counter);
@@ -3439,7 +3439,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
			(EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb)));

	db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) /

		   EXT4_DESC_PER_BLOCK(sb);

	sbi->s_group_desc = kmalloc(db_count * sizeof(struct buffer_head *),

	sbi->s_group_desc = ext4_kvmalloc(db_count *

					  sizeof(struct buffer_head *),

					  GFP_KERNEL);

	if (sbi->s_group_desc == NULL) {

		ext4_msg(sb, KERN_ERR, "not enough memory");
@@ -3783,7 +3784,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
failed_mount2:

	for (i = 0; i < db_count; i++)

		brelse(sbi->s_group_desc[i]);

	kfree(sbi->s_group_desc);

	ext4_kvfree(sbi->s_group_desc);

failed_mount:

	if (sbi->s_proc) {

		remove_proc_entry(sb->s_id, ext4_proc_root);