2008-07-24 01:31:53

by Li Zefan

Subject: [PATCH] ext4: improve ext4_fill_flex_info() a bit

- use kzalloc() instead of kmalloc() + memset()
- improve a printk info

Signed-off-by: Li Zefan <[email protected]>
---
fs/ext4/super.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 1cb371d..33eab31 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1506,14 +1506,13 @@ static int ext4_fill_flex_info(struct super_block *sb)

flex_group_count = (sbi->s_groups_count + groups_per_flex - 1) /
groups_per_flex;
- sbi->s_flex_groups = kmalloc(flex_group_count *
+ sbi->s_flex_groups = kzalloc(flex_group_count *
sizeof(struct flex_groups), GFP_KERNEL);
if (sbi->s_flex_groups == NULL) {
- printk(KERN_ERR "EXT4-fs: not enough memory\n");
+ printk(KERN_ERR "EXT4-fs: not enough memory for "
+ "%lu flex groups\n", flex_group_count);
goto failed;
}
- memset(sbi->s_flex_groups, 0, flex_group_count *
- sizeof(struct flex_groups));

gdp = ext4_get_group_desc(sb, 1, &bh);
block_bitmap = ext4_block_bitmap(sb, gdp) - 1;
--
1.5.4.rc3

2008-07-24 17:09:41

by Jose R. Santos

Subject: Re: [PATCH] ext4: improve ext4_fill_flex_info() a bit

On Thu, 24 Jul 2008 09:30:20 +0800
Li Zefan <[email protected]> wrote:

> - use kzalloc() instead of kmalloc() + memset()
> - improve a printk info

Nicer - Thanks

Acked-by: Jose R. Santos <[email protected]>

>
> Signed-off-by: Li Zefan <[email protected]>
> ---
> fs/ext4/super.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 1cb371d..33eab31 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -1506,14 +1506,13 @@ static int ext4_fill_flex_info(struct super_block *sb)
>
> flex_group_count = (sbi->s_groups_count + groups_per_flex - 1) /
> groups_per_flex;
> - sbi->s_flex_groups = kmalloc(flex_group_count *
> + sbi->s_flex_groups = kzalloc(flex_group_count *
> sizeof(struct flex_groups), GFP_KERNEL);
> if (sbi->s_flex_groups == NULL) {
> - printk(KERN_ERR "EXT4-fs: not enough memory\n");
> + printk(KERN_ERR "EXT4-fs: not enough memory for "
> + "%lu flex groups\n", flex_group_count);
> goto failed;
> }
> - memset(sbi->s_flex_groups, 0, flex_group_count *
> - sizeof(struct flex_groups));
>
> gdp = ext4_get_group_desc(sb, 1, &bh);
> block_bitmap = ext4_block_bitmap(sb, gdp) - 1;

2008-07-24 18:27:41

by Theodore Ts'o

Subject: Re: [PATCH] ext4: improve ext4_fill_flex_info() a bit

On Thu, Jul 24, 2008 at 12:09:38PM -0500, Jose R. Santos wrote:
> On Thu, 24 Jul 2008 09:30:20 +0800
> Li Zefan <[email protected]> wrote:
>
> > - use kzalloc() instead of kmalloc() + memset()
> > - improve a printk info
>
> Nicer - Thanks
>
> Acked-by: Jose R. Santos <[email protected]>

I've already merged this into the patch queue earlier today.

- Ted