summaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre
diff options
context:
space:
mode:
authorAndriy Skulysh <Andriy_Skulysh@xyratex.com>2016-04-27 21:37:16 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-28 21:53:18 -0700
commit9ebd48965864093b2616cab2df2ea9a73f3aab53 (patch)
tree5f5733434757ba83735a6dccd67f160bf7301f68 /drivers/staging/lustre
parent98f2ec61203ff300465d9e44c5657ebf9c870ef6 (diff)
downloadop-kernel-dev-9ebd48965864093b2616cab2df2ea9a73f3aab53.zip
op-kernel-dev-9ebd48965864093b2616cab2df2ea9a73f3aab53.tar.gz
staging: lustre: libcfs: Fix NUMA emulated mode
Kernel commit c1c3443c9c5e9be92641029ed229a41563e44506 assigns all allowed cpus to emulated node. End cpt initialization loop when all CPUs are assigned. Signed-off-by: Andriy Skulysh <Andriy_Skulysh@xyratex.com> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3992 Reviewed-on: http://review.whamcloud.com/7724 Reviewed-by: Liang Zhen <liang.zhen@intel.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
-rw-r--r--drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
index 389fb9e..b52518c5 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
@@ -755,8 +755,13 @@ cfs_cpt_table_create(int ncpt)
struct cfs_cpu_partition *part;
int n;
- if (cpt >= ncpt)
- goto failed;
+ /*
+ * Each emulated NUMA node has all allowed CPUs in
+ * the mask.
+ * End loop when all partitions have assigned CPUs.
+ */
+ if (cpt == ncpt)
+ break;
part = &cptab->ctb_parts[cpt];
OpenPOWER on IntegriCloud