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

Commit b93b41d4 authored by Al Viro's avatar Al Viro Committed by Theodore Ts'o
Browse files

ext4: kill ext4_kvfree() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 88c6b61f

fs/ext4/ext4.h

+0 −1
Original line number Diff line number Diff line
@@ -2192,7 +2192,6 @@ extern int ext4_calculate_overhead(struct super_block *sb); 
extern void ext4_superblock_csum_set(struct super_block *sb);

extern void *ext4_kvmalloc(size_t size, gfp_t flags);

extern void *ext4_kvzalloc(size_t size, gfp_t flags);

extern void ext4_kvfree(void *ptr);

extern int ext4_alloc_flex_bg_array(struct super_block *sb,

				    ext4_group_t ngroup);

extern const char *ext4_decode_error(struct super_block *sb, int errno,

fs/ext4/mballoc.c

+3 −3
Original line number Diff line number Diff line
@@ -2358,7 +2358,7 @@ int ext4_mb_alloc_groupinfo(struct super_block *sb, ext4_group_t ngroups) 
	if (sbi->s_group_info) {

		memcpy(new_groupinfo, sbi->s_group_info,

		       sbi->s_group_info_size * sizeof(*sbi->s_group_info));

		ext4_kvfree(sbi->s_group_info);

		kvfree(sbi->s_group_info);

	}

	sbi->s_group_info = new_groupinfo;

	sbi->s_group_info_size = size / sizeof(*sbi->s_group_info);
@@ -2495,7 +2495,7 @@ static int ext4_mb_init_backend(struct super_block *sb) 
		kfree(sbi->s_group_info[i]);

	iput(sbi->s_buddy_cache);

err_freesgi:

	ext4_kvfree(sbi->s_group_info);

	kvfree(sbi->s_group_info);

	return -ENOMEM;

}
@@ -2708,7 +2708,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]);

		ext4_kvfree(sbi->s_group_info);

		kvfree(sbi->s_group_info);

	}

	kfree(sbi->s_mb_offsets);

	kfree(sbi->s_mb_maxs);

fs/ext4/resize.c

+3 −3
Original line number Diff line number Diff line
@@ -856,7 +856,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++;

	ext4_kvfree(o_group_desc);

	kvfree(o_group_desc);



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

	err = ext4_handle_dirty_super(handle, sb);
@@ -866,7 +866,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
	return err;



exit_inode:

	ext4_kvfree(n_group_desc);

	kvfree(n_group_desc);

	brelse(iloc.bh);

exit_dind:

	brelse(dind);
@@ -909,7 +909,7 @@ static int add_new_gdb_meta_bg(struct super_block *sb, 
	n_group_desc[gdb_num] = gdb_bh;

	EXT4_SB(sb)->s_group_desc = n_group_desc;

	EXT4_SB(sb)->s_gdb_count++;

	ext4_kvfree(o_group_desc);

	kvfree(o_group_desc);

	BUFFER_TRACE(gdb_bh, "get_write_access");

	err = ext4_journal_get_write_access(handle, gdb_bh);

	if (unlikely(err))

fs/ext4/super.c

+5 −14
Original line number Diff line number Diff line
@@ -176,15 +176,6 @@ void *ext4_kvzalloc(size_t size, gfp_t flags) 
	return ret;

}



void ext4_kvfree(void *ptr)

{

	if (is_vmalloc_addr(ptr))

		vfree(ptr);

	else

		kfree(ptr);



}



ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,

			       struct ext4_group_desc *bg)

{
@@ -811,8 +802,8 @@ static void ext4_put_super(struct super_block *sb) 


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

		brelse(sbi->s_group_desc[i]);

	ext4_kvfree(sbi->s_group_desc);

	ext4_kvfree(sbi->s_flex_groups);

	kvfree(sbi->s_group_desc);

	kvfree(sbi->s_flex_groups);

	percpu_counter_destroy(&sbi->s_freeclusters_counter);

	percpu_counter_destroy(&sbi->s_freeinodes_counter);

	percpu_counter_destroy(&sbi->s_dirs_counter);
@@ -1939,7 +1930,7 @@ int ext4_alloc_flex_bg_array(struct super_block *sb, ext4_group_t ngroup) 
		memcpy(new_groups, sbi->s_flex_groups,

		       (sbi->s_flex_groups_allocated *

			sizeof(struct flex_groups)));

		ext4_kvfree(sbi->s_flex_groups);

		kvfree(sbi->s_flex_groups);

	}

	sbi->s_flex_groups = new_groups;

	sbi->s_flex_groups_allocated = size / sizeof(struct flex_groups);
@@ -4224,7 +4215,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
failed_mount6:

	ext4_mb_release(sb);

	if (sbi->s_flex_groups)

		ext4_kvfree(sbi->s_flex_groups);

		kvfree(sbi->s_flex_groups);

	percpu_counter_destroy(&sbi->s_freeclusters_counter);

	percpu_counter_destroy(&sbi->s_freeinodes_counter);

	percpu_counter_destroy(&sbi->s_dirs_counter);
@@ -4253,7 +4244,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]);

	ext4_kvfree(sbi->s_group_desc);

	kvfree(sbi->s_group_desc);

failed_mount:

	if (sbi->s_chksum_driver)

		crypto_free_shash(sbi->s_chksum_driver);