Aneesh Kumar K.V wrote:
> NR_CPUS can be really large. We should be using nr_cpu_ids
> instead.
Yep, thanks, I thought we got rid of these at some point but guess not
(or not all)!
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Acked-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> fs/ext4/mballoc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index 9db0f4d..5b854b7 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -2541,7 +2541,7 @@ int ext4_mb_init(struct super_block *sb, int needs_recovery)
> sbi->s_mb_history_filter = EXT4_MB_HISTORY_DEFAULT;
> sbi->s_mb_group_prealloc = MB_DEFAULT_GROUP_PREALLOC;
>
> - i = sizeof(struct ext4_locality_group) * NR_CPUS;
> + i = sizeof(struct ext4_locality_group) * nr_cpu_ids;
> sbi->s_locality_groups = kmalloc(i, GFP_KERNEL);
> if (sbi->s_locality_groups == NULL) {
> clear_opt(sbi->s_mount_opt, MBALLOC);
> @@ -2549,7 +2549,7 @@ int ext4_mb_init(struct super_block *sb, int needs_recovery)
> kfree(sbi->s_mb_maxs);
> return -ENOMEM;
> }
> - for (i = 0; i < NR_CPUS; i++) {
> + for (i = 0; i < nr_cpu_ids; i++) {
> struct ext4_locality_group *lg;
> lg = &sbi->s_locality_groups[i];
> mutex_init(&lg->lg_mutex);
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
