X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fworkitem.c;h=5069ccd6c6e4fce61c17311f2e07675bcef69f0a;hb=61743b88672687f789f9c609c85a351e1595118b;hp=168fea5ca74293b721f922db56ee2fbd71ee2854;hpb=53aee2559638e25dd6dc664ceab2b023eaac1cb5;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/workitem.c b/libcfs/libcfs/workitem.c
index 168fea5..5069ccd 100644
--- a/libcfs/libcfs/workitem.c
+++ b/libcfs/libcfs/workitem.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -216,7 +212,7 @@ cfs_wi_scheduler(void *arg)
 	/* CPT affinity scheduler? */
 	if (sched->ws_cptab != NULL)
 		if (cfs_cpt_bind(sched->ws_cptab, sched->ws_cpt) != 0)
-			CWARN("Failed to bind %s on CPT %d\n",
+			CWARN("Unable to bind %s on CPU partition %d\n",
 				sched->ws_name, sched->ws_cpt);
 
 	spin_lock(&cfs_wi_data.wi_glock);
@@ -317,7 +313,7 @@ cfs_wi_sched_destroy(struct cfs_wi_sched *sched)
 		int i = 2;
 
 		while (sched->ws_nthreads > 0) {
-			CDEBUG(IS_PO2(++i) ? D_WARNING : D_NET,
+			CDEBUG(is_power_of_2(++i) ? D_WARNING : D_NET,
 			       "waiting for %d threads of WI sched[%s] to "
 			       "terminate\n", sched->ws_nthreads,
 			       sched->ws_name);