2010-10-11 10:38:49

by Namhyung Kim

Subject: [PATCH] ext3: Use DIV_ROUND_UP() on group desc block counting

Signed-off-by: Namhyung Kim <[email protected]>
---
fs/ext3/super.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 75bbf77..3fce402 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1864,8 +1864,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
sbi->s_groups_count = ((le32_to_cpu(es->s_blocks_count) -
le32_to_cpu(es->s_first_data_block) - 1)
/ EXT3_BLOCKS_PER_GROUP(sb)) + 1;
- db_count = (sbi->s_groups_count + EXT3_DESC_PER_BLOCK(sb) - 1) /
- EXT3_DESC_PER_BLOCK(sb);
+ db_count = DIV_ROUND_UP(sbi->s_groups_count, EXT3_DESC_PER_BLOCK(sb));
sbi->s_group_desc = kmalloc(db_count * sizeof (struct buffer_head *),
GFP_KERNEL);
if (sbi->s_group_desc == NULL) {
--
1.7.0.4

2010-10-11 14:46:29

by Jan Kara

Subject: Re: [PATCH] ext3: Use DIV_ROUND_UP() on group desc block counting

On Mon 11-10-10 19:38:39, Namhyung Kim wrote:
> Signed-off-by: Namhyung Kim <[email protected]>
OK. Merged.

Honza
> ---
> fs/ext3/super.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> index 75bbf77..3fce402 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext3/super.c
> @@ -1864,8 +1864,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
> sbi->s_groups_count = ((le32_to_cpu(es->s_blocks_count) -
> le32_to_cpu(es->s_first_data_block) - 1)
> / EXT3_BLOCKS_PER_GROUP(sb)) + 1;
> - db_count = (sbi->s_groups_count + EXT3_DESC_PER_BLOCK(sb) - 1) /
> - EXT3_DESC_PER_BLOCK(sb);
> + db_count = DIV_ROUND_UP(sbi->s_groups_count, EXT3_DESC_PER_BLOCK(sb));
> sbi->s_group_desc = kmalloc(db_count * sizeof (struct buffer_head *),
> GFP_KERNEL);
> if (sbi->s_group_desc == NULL) {
> --
> 1.7.0.4
>
--
Jan Kara <[email protected]>
SUSE Labs, CR