diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 08:20:58 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 08:20:58 +0800 |
| commit | 8db0fc89312ec8132654a614bc0ff4a6bd2e49fa (patch) | |
| tree | 962937002b7b4b49a31998a3ba3f193edd90b43a | |
| parent | 6960736c01732ad952aa6c513976fa0b95166873 (diff) | |
| download | linux-8db0fc89312ec8132654a614bc0ff4a6bd2e49fa.tar.bz2 | |
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>
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h | 44 |
1 files changed, 0 insertions, 44 deletions
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 64e75c7bfc43..acf338b3eb36 100644 --- 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 |