From 945ded4379d6e2cd53369485fb7ee0b4044c37ab Mon Sep 17 00:00:00 2001
From: nikita <nikita>
Date: Sat, 18 Oct 2008 17:43:11 +0000
Subject: [PATCH] libcfs: add cfs_{need,cond}_resched() definition and
 implementations for Linux, NT, and liblustre. b=16450

---
 libcfs/include/libcfs/libcfs_prim.h |  2 ++
 libcfs/libcfs/linux/linux-prim.c    | 12 ++++++++++++
 libcfs/libcfs/user-prim.c           |  9 +++++++++
 libcfs/libcfs/winnt/winnt-prim.c    |  9 +++++++++
 lustre/ChangeLog                    |  6 ++++++
 5 files changed, 38 insertions(+)

diff --git a/libcfs/include/libcfs/libcfs_prim.h b/libcfs/include/libcfs/libcfs_prim.h
index 64938a5..8dca0a9 100644
--- a/libcfs/include/libcfs/libcfs_prim.h
+++ b/libcfs/include/libcfs/libcfs_prim.h
@@ -48,6 +48,8 @@
 void cfs_schedule_timeout(cfs_task_state_t state, int64_t timeout);
 void cfs_schedule(void);
 void cfs_pause(cfs_duration_t ticks);
+int  cfs_need_resched(void);
+void cfs_cond_resched(void);
 
 /*
  * Wait Queues
diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c
index f8cdf81..9019b3f 100644
--- a/libcfs/libcfs/linux/linux-prim.c
+++ b/libcfs/libcfs/linux/linux-prim.c
@@ -153,6 +153,18 @@ cfs_pause(cfs_duration_t ticks)
 }
 EXPORT_SYMBOL(cfs_pause);
 
+int cfs_need_resched(void)
+{
+        return need_resched();
+}
+EXPORT_SYMBOL(cfs_need_resched);
+
+void cfs_cond_resched(void)
+{
+        cond_resched();
+}
+EXPORT_SYMBOL(cfs_cond_resched);
+
 void cfs_init_timer(cfs_timer_t *t)
 {
         init_timer(t);
diff --git a/libcfs/libcfs/user-prim.c b/libcfs/libcfs/user-prim.c
index ee381d6..bf57b4c 100644
--- a/libcfs/libcfs/user-prim.c
+++ b/libcfs/libcfs/user-prim.c
@@ -143,6 +143,15 @@ cfs_pause(cfs_duration_t d)
         nanosleep(&s, NULL);
 }
 
+int cfs_need_resched(void)
+{
+        return 0;
+}
+
+void cfs_cond_resched(void)
+{
+}
+
 /*
  * Timer
  */
diff --git a/libcfs/libcfs/winnt/winnt-prim.c b/libcfs/libcfs/winnt/winnt-prim.c
index e62a39e..e271e18 100644
--- a/libcfs/libcfs/winnt/winnt-prim.c
+++ b/libcfs/libcfs/winnt/winnt-prim.c
@@ -741,6 +741,15 @@ errorout:
     return NT_SUCCESS(status);
 }
 
+int cfs_need_resched(void)
+{
+        return 0;
+}
+
+void cfs_cond_resched(void)
+{
+}
+
 /**
  **  Initialize routines 
  **/
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 66e874b..6d3b6d6 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1718,6 +1718,12 @@ Bugzilla   : 16450
 Description: Liblustre build fixes.
 Details    : Liblustre build fixes.
 
+Severity   : normal
+Bugzilla   : 16450
+Description: libcfs: add cfs_{need,cond}_resched() interface.
+Details    : libcfs: add cfs_{need,cond}_resched() definition and
+	     implementations for Linux, NT, and liblustre.
+
 --------------------------------------------------------------------------------
 
 2007-08-10         Cluster File Systems, Inc. <info@clusterfs.com>
-- 
1.8.3.1