mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

staging: lustre: lnet/selftest: fix compile error on UP build

Browse source 
When compiled without CONFIG_SMP, we get a compile error
as ->ctb_parts is not defined.

There is already a function, cfs_cpt_cpumask(), which will get the
cpumask we need, and which handles the UP case by returning a NULL pointer.
So use that and handle NULL.
Also avoid the #ifdef by allocating a cpumask_var and copying
into it, rather than sharing the mask.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Fixes: 6106c0f824 ("staging: lustre: lnet: convert selftest to use workqueues")
Signed-off-by: NeilBrown <neilb@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
NeilBrown 2018-01-23 17:27:47 +11:00 committed by Greg Kroah-Hartman
parent 9fb8b101a7
commit 7d70718de0
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/lustre/lnet/selftest/module.c
View file

@ -110,7 +110,8 @@ lnet_selftest_init(void)
lst_init_step = LST_INIT_WI_TEST;
for (i = 0; i < nscheds; i++) {
int nthrs = cfs_cpt_weight(lnet_cpt_table(), i);
struct workqueue_attrs attrs;
struct workqueue_attrs attrs = {0};
cpumask_var_t *mask = cfs_cpt_cpumask(lnet_cpt_table(), i);
/* reserve at least one CPU for LND */
nthrs = max(nthrs - 1, 1);
@ -121,14 +122,12 @@ lnet_selftest_init(void)
rc = -ENOMEM;
goto error;
}
attrs.nice = 0;
#ifdef CONFIG_CPUMASK_OFFSTACK
attrs.cpumask = lnet_cpt_table()->ctb_parts[i].cpt_cpumask;
#else
cpumask_copy(attrs.cpumask, lnet_cpt_table()->ctb_parts[i].cpt_cpumask);
#endif
attrs.no_numa = false;
apply_workqueue_attrs(lst_test_wq[i], &attrs);
if (mask && alloc_cpumask_var(&attrs.cpumask, GFP_KERNEL)) {
cpumask_copy(attrs.cpumask, *mask);
apply_workqueue_attrs(lst_test_wq[i], &attrs);
free_cpumask_var(attrs.cpumask);
}
}
rc = srpc_startup();