staging: lustre: remove unused cfs_ waitqueue wrappers

These weren't ever used, so just remove them.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index 64e75c7bfc43b2b89d876eb5e7ee1a4b0f95d5c0..acf338b3eb36d706b247cc429ea7e22984c08d9a 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -112,48 +112,4 @@ typedef struct task_struct       task_t;
  */
 typedef struct timer_list timer_list_t;
 
-
-#ifndef wait_event_timeout /* Only for RHEL3 2.4.21 kernel */
-#define __wait_event_timeout(wq, condition, timeout, ret)      \
-do {                                                        \
-       int __ret = 0;                                     \
-       if (!(condition)) {                                   \
-               wait_queue_t __wait;                         \
-               unsigned long expire;                       \
-                                                                \
-               init_waitqueue_entry(&__wait, current);   \
-               expire = timeout + jiffies;                   \
-               add_wait_queue(&wq, &__wait);               \
-               for (;;) {                                     \
-                       set_current_state(TASK_UNINTERRUPTIBLE); \
-                       if (condition)                     \
-                               break;                     \
-                       if (jiffies > expire) {           \
-                               ret = jiffies - expire;   \
-                               break;                     \
-                       }                                       \
-                       schedule_timeout(timeout);             \
-               }                                               \
-               current->state = TASK_RUNNING;             \
-               remove_wait_queue(&wq, &__wait);                 \
-       }                                                       \
-} while (0)
-/*
-   retval == 0; condition met; we're good.
-   retval > 0; timed out.
-*/
-#define cfs_waitq_wait_event_timeout(wq, condition, timeout, ret)    \
-do {                                                            \
-       ret = 0;                                                     \
-       if (!(condition))                                           \
-               __wait_event_timeout(wq, condition, timeout, ret);   \
-} while (0)
-#else
-#define cfs_waitq_wait_event_timeout(wq, condition, timeout, ret)    \
-       ret = wait_event_timeout(wq, condition, timeout)
-#endif
-
-#define cfs_waitq_wait_event_interruptible_timeout(wq, c, timeout, ret) \
-       ret = wait_event_interruptible_timeout(wq, c, timeout)
-
 #endif