From: James Simmons <uja.ornl@yahoo.com>
Date: Sun, 4 Jun 2017 15:34:11 +0000 (-0400)
Subject: LU-8661 libcfs: handle pdata_set_cpumasks() removal
X-Git-Tag: 2.9.59~3
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=24d9e6ec44651abea0c4985a6b91d850b0257301

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 <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/27422
Tested-by: Jenkins
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

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 */