Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1320cbcf authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext4: Convert the usage of NR_CPUS to nr_cpu_ids. 



NR_CPUS can be really large. We should be using nr_cpu_ids instead.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent ce89f46c

fs/ext4/mballoc.c

+2 −2
Original line number Diff line number Diff line
@@ -2540,7 +2540,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);
@@ -2548,7 +2548,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);