From 24d9e6ec44651abea0c4985a6b91d850b0257301 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sun, 4 Jun 2017 11:34:11 -0400 Subject: [PATCH] LU-8661 libcfs: handle pdata_set_cpumasks() removal In Linux commit 815613da6a67c196d7458d0e6c278ea88e21933f the function padata_set_cpumasks was removed since no one was using it upstream. In order to support newer kernels we need to migrate to pdata_set_cpumask() instead. Change-Id: Ia2e5143d9a2649bfbf9e1df1fb7f2d1b3c807884 Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/27422 Tested-by: Jenkins Reviewed-by: Dmitry Eremin Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Doug Oucharek Reviewed-by: Oleg Drokin --- libcfs/libcfs/libcfs_ptask.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libcfs/libcfs/libcfs_ptask.c b/libcfs/libcfs/libcfs_ptask.c index 0548dae..96d984d 100644 --- a/libcfs/libcfs/libcfs_ptask.c +++ b/libcfs/libcfs/libcfs_ptask.c @@ -276,9 +276,15 @@ int cfs_ptengine_set_cpumask(struct cfs_ptask_engine *engine, cpumask_copy(parallel_mask, cpumask); cpumask_copy(serial_mask, cpu_online_mask); - rc = padata_set_cpumasks(engine->pte_pinst, parallel_mask, serial_mask); - + rc = padata_set_cpumask(engine->pte_pinst, PADATA_CPU_PARALLEL, + parallel_mask); free_cpumask_var(parallel_mask); + if (rc) + goto out_failed_mask; + + rc = padata_set_cpumask(engine->pte_pinst, PADATA_CPU_SERIAL, + serial_mask); +out_failed_mask: free_cpumask_var(serial_mask); #endif /* CONFIG_PADATA */ -- 1.8.3.1