diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2009-08-25 22:36:25 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-08-25 22:36:25 -0400 |
| commit | 1927805e6599d8602d2c0af6a0155c85acc0b214 (patch) | |
| tree | b5549d33960ef312efc3b8f54c78268a3e4f74dd | |
| parent | a8526e84ac758ac6da45cf273aa1538a6a7aa3de (diff) | |
| download | linux-3.10-1927805e6599d8602d2c0af6a0155c85acc0b214.tar.gz linux-3.10-1927805e6599d8602d2c0af6a0155c85acc0b214.tar.bz2 linux-3.10-1927805e6599d8602d2c0af6a0155c85acc0b214.zip | |
ext4: use variables not types in sizeofs() for allocations
Precursor to changing some types; to keep things in sync, it
seems better to allocate/memset based on the size of the
variables we are using rather than on some disconnected
basic type like "unsigned short"
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
| -rw-r--r-- | fs/ext4/mballoc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 1a9cd7de04d..081eaf7fce8 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -868,7 +868,8 @@ static int ext4_mb_init_cache(struct page *page, char *incore) grinfo = ext4_get_group_info(sb, group); grinfo->bb_fragments = 0; memset(grinfo->bb_counters, 0, - sizeof(unsigned short)*(sb->s_blocksize_bits+2)); + sizeof(*grinfo->bb_counters) * + (sb->s_blocksize_bits+2)); /* * incore got set to the group block bitmap below */ @@ -2640,14 +2641,14 @@ int ext4_mb_init(struct super_block *sb, int needs_recovery) unsigned max; int ret; - i = (sb->s_blocksize_bits + 2) * sizeof(unsigned short); + i = (sb->s_blocksize_bits + 2) * sizeof(*sbi->s_mb_offsets); sbi->s_mb_offsets = kmalloc(i, GFP_KERNEL); if (sbi->s_mb_offsets == NULL) { return -ENOMEM; } - i = (sb->s_blocksize_bits + 2) * sizeof(unsigned int); + i = (sb->s_blocksize_bits + 2) * sizeof(*sbi->s_mb_maxs); sbi->s_mb_maxs = kmalloc(i, GFP_KERNEL); if (sbi->s_mb_maxs == NULL) { kfree(sbi->s_mb_offsets); |