ext4: use kvzalloc and kvfree
PATCH 5/9 ext4: use kvzalloc and kvfree
use kvzalloc and kvfree
use kvzalloc and kvfree
Signed-off-by Changli Gao <[email protected]>
----
fs/ext4/super.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
fs/ext4/super.c +4 -17
@@ -20,7 +20,6 @@#include <linux/string.h> #include <linux/fs.h> #include <linux/time.h> -#include <linux/vmalloc.h> #include <linux/jbd2.h> #include <linux/slab.h> #include <linux/init.h>
@@ -679,10 +678,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); -if (is_vmalloc_addr (sbi->s_flex_groups)) -vfree (sbi->s_flex_groups); -else -kfree (sbi->s_flex_groups); +kvfree (sbi->s_flex_groups);percpu_counter_destroy (&sbi->s_freeblocks_counter);percpu_counter_destroy (&sbi->s_freeinodes_counter);percpu_counter_destroy (&sbi->s_dirs_counter);
@@ -1810,12 +1806,7 @@ static int ext4_fill_flex_info(struct super_block *sb) ((le16_to_cpu (sbi->s_es->s_reserved_gdt_blocks) +1 ) << EXT4_DESC_PER_BLOCK_BITS(sb))) / groups_per_flex; size = flex_group_count *sizeof (struct flex_groups ); - sbi->s_flex_groups =kzalloc (size,GFP_KERNEL ); -if (sbi->s_flex_groups ==NULL ) { - sbi->s_flex_groups =vmalloc (size); -if (sbi->s_flex_groups) -memset (sbi->s_flex_groups,0 , size); - } + sbi->s_flex_groups =kvzalloc (size);if (sbi->s_flex_groups ==NULL ) {ext4_msg (sb,KERN_ERR ,"not enough memory for " "%u flex groups" , flex_group_count);
@@ -3060,12 +3051,8 @@ failed_mount_wq: sbi->s_journal =NULL ; } failed_mount3: -if (sbi->s_flex_groups) { -if (is_vmalloc_addr (sbi->s_flex_groups)) -vfree (sbi->s_flex_groups); -else -kfree (sbi->s_flex_groups); - } +if (sbi->s_flex_groups) +kvfree (sbi->s_flex_groups);percpu_counter_destroy (&sbi->s_freeblocks_counter);percpu_counter_destroy (&sbi->s_freeinodes_counter);percpu_counter_destroy (&sbi->s_dirs_counter);