Commit 9561c25c authored by Shivani Bhardwaj's avatar Shivani Bhardwaj Committed by Greg Kroah-Hartman
Browse files

Staging: lustre: linux-cpu: Drop wrapper function 



Remove the function cfs_cpu_ht_siblings() and replace all its calls with
the function it wrapped.

Siigned-off-by: default avatarShivani Bhardwaj <shivanib134@gmail.com>

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d6e398c

drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c

+3 −8
Original line number Diff line number Diff line
@@ -78,12 +78,6 @@ struct cfs_cpt_data { 


static struct cfs_cpt_data	cpt_data;



/* return cpumask of HTs in the same core */

static void cfs_cpu_ht_siblings(int cpu, cpumask_t *mask)

{

	cpumask_copy(mask, topology_sibling_cpumask(cpu));

}



static void cfs_node_to_cpumask(int node, cpumask_t *mask)

{

	cpumask_copy(mask, cpumask_of_node(node));
@@ -646,7 +640,7 @@ cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt, 
			int     i;



			/* get cpumask for hts in the same core */

			cfs_cpu_ht_siblings(cpu, core);

			cpumask_copy(core, topology_sibling_cpumask(cpu));

			cpumask_and(core, core, node);



			LASSERT(!cpumask_empty(core));
@@ -962,7 +956,8 @@ cfs_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) 


		mutex_lock(&cpt_data.cpt_mutex);

		/* if all HTs in a core are offline, it may break affinity */

		cfs_cpu_ht_siblings(cpu, cpt_data.cpt_cpumask);

		cpumask_copy(cpt_data.cpt_cpumask,

			     topology_sibling_cpumask(cpu));

		warn = cpumask_any_and(cpt_data.cpt_cpumask,

				       cpu_online_mask) >= nr_cpu_ids;

		mutex_unlock(&cpt_data.cpt_mutex);